diff --git a/sdk/storage/azure-mgmt-storage/_meta.json b/sdk/storage/azure-mgmt-storage/_meta.json
index f0e85fb8d046..4de5acfd3533 100644
--- a/sdk/storage/azure-mgmt-storage/_meta.json
+++ b/sdk/storage/azure-mgmt-storage/_meta.json
@@ -1,12 +1,12 @@
 {
-  "commit": "43f10d3b8bacd5fc6b01254b5050c613f26c3573",
+  "commit": "596a201b1957a45c51436f0a0d0d2b065ed09df3",
   "repository_url": "https://github.com/Azure/azure-rest-api-specs",
   "autorest": "3.10.2",
   "use": [
-    "@autorest/python@6.13.19",
+    "@autorest/python@6.27.2",
     "@autorest/modelerfour@4.27.0"
   ],
-  "autorest_command": "autorest specification/storage/resource-manager/readme.md --generate-sample=True --include-x-ms-examples-original-file=True --python --python-sdks-folder=/home/vsts/work/1/azure-sdk-for-python/sdk --use=@autorest/python@6.13.19 --use=@autorest/modelerfour@4.27.0 --version=3.10.2 --version-tolerant=False",
+  "autorest_command": "autorest specification/storage/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.2 --use=@autorest/modelerfour@4.27.0 --version=3.10.2 --version-tolerant=False",
   "readme": "specification/storage/resource-manager/readme.md",
   "package-2023-01": "2023-07-20 11:56:40 -0700 3e6b4ddca225530c27273d0f816466a905c0151b Microsoft.Storage/stable/2023-01-01/table.json",
   "package-2022-09": "2022-11-13 19:43:16 -0800 da0cfefaa0e6c237e1e3819f1cb2e11d7606878d Microsoft.Storage/stable/2022-09-01/table.json",
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/_serialization.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/_serialization.py
index 8a43569e0754..a94487cbf17a 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/_serialization.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/_serialization.py
@@ -24,7 +24,6 @@
 #
 # --------------------------------------------------------------------------
 
-# pylint: skip-file
 # pyright: reportUnnecessaryTypeIgnoreComment=false
 
 from base64 import b64decode, b64encode
@@ -52,7 +51,6 @@
     MutableMapping,
     Type,
     List,
-    Mapping,
 )
 
 try:
@@ -91,6 +89,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 +112,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:
 
@@ -144,6 +144,8 @@ def _json_attemp(data):
                 # context otherwise.
                 _LOGGER.critical("Wasn't XML not JSON, failing")
                 raise DeserializationError("XML is invalid") from err
+        elif content_type.startswith("text/"):
+            return data_as_str
         raise DeserializationError("Cannot deserialize content-type: {}".format(content_type))
 
     @classmethod
@@ -153,6 +155,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
@@ -182,15 +189,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)
 
 
@@ -204,7 +226,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):
@@ -233,24 +255,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)
@@ -263,22 +287,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.
     """
@@ -289,7 +320,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):
@@ -298,13 +329,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:
@@ -324,7 +365,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:
@@ -344,14 +389,14 @@ 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,
         keep_readonly: bool = True,
-        key_transformer: Callable[
-            [str, Dict[str, Any], Any], Any
-        ] = attribute_transformer,
+        key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer,
         **kwargs: Any
     ) -> JSON:
         """Return a dict that can be serialized using json.dump.
@@ -380,12 +425,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 +443,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 +456,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 +475,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 +499,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 +556,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 +597,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 +617,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 +652,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 +695,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 +727,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 +766,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 +775,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,27 +793,26 @@ 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
             if data_type.startswith("["):
                 internal_data_type = data_type[1:-1]
-                do_quote = not kwargs.get('skip_quote', False)
+                do_quote = not kwargs.get("skip_quote", False)
                 return self.serialize_iter(data, internal_data_type, do_quote=do_quote, **kwargs)
 
             # Not a list, regular serialization
@@ -759,19 +823,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 +845,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 +869,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 +885,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 +904,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 +937,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 +947,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.")
@@ -907,12 +970,8 @@ def serialize_iter(self, data, iter_type, div=None, **kwargs):
                     raise
                 serialized.append(None)
 
-        if kwargs.get('do_quote', False):
-            serialized = [
-                '' if s is None else quote(str(s), safe='')
-                for s
-                in serialized
-            ]
+        if kwargs.get("do_quote", False):
+            serialized = ["" if s is None else quote(str(s), safe="") for s in serialized]
 
         if div:
             serialized = ["" if s is None else str(s) for s in serialized]
@@ -949,9 +1008,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 = {}
@@ -975,7 +1033,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
@@ -983,6 +1041,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
@@ -1007,7 +1066,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:
@@ -1038,56 +1097,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)
@@ -1095,11 +1159,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)
@@ -1109,30 +1174,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],
@@ -1145,12 +1212,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)
@@ -1176,13 +1244,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
@@ -1190,11 +1259,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
 
@@ -1215,7 +1284,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
 
@@ -1236,17 +1307,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)
@@ -1283,7 +1366,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
 
@@ -1335,22 +1418,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:
@@ -1358,7 +1440,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.
@@ -1367,9 +1449,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,
@@ -1407,11 +1489,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
@@ -1420,12 +1503,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)
@@ -1444,13 +1528,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"...
@@ -1480,9 +1564,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:
@@ -1509,6 +1592,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
@@ -1520,7 +1605,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
@@ -1535,10 +1620,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
             )
@@ -1556,10 +1643,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", {})
@@ -1583,24 +1672,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():
@@ -1609,15 +1709,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
@@ -1631,7 +1732,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)
@@ -1651,14 +1756,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:
@@ -1675,6 +1780,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):
@@ -1685,11 +1791,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.
         """
@@ -1724,11 +1831,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
@@ -1736,6 +1842,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.
         """
@@ -1747,24 +1854,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):
@@ -1772,6 +1878,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,
@@ -1785,8 +1892,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):
@@ -1798,6 +1904,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:
@@ -1808,9 +1915,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:
@@ -1826,6 +1933,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.
         """
@@ -1838,6 +1946,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.
         """
@@ -1853,8 +1962,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
@@ -1869,6 +1979,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.
         """
@@ -1881,6 +1992,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.
         """
@@ -1891,14 +2003,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.
         """
@@ -1914,6 +2026,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.
         """
@@ -1928,6 +2041,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.
         """
@@ -1943,14 +2057,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.
         """
@@ -1980,8 +2094,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):
@@ -1989,6 +2102,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
         """
@@ -2000,5 +2114,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/storage/azure-mgmt-storage/azure/mgmt/storage/_storage_management_client.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/_storage_management_client.py
index c886e7068b13..4516e34b4d51 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/_storage_management_client.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/_storage_management_client.py
@@ -10,6 +10,7 @@
 # --------------------------------------------------------------------------
 
 from typing import Any, Optional, TYPE_CHECKING
+from typing_extensions import Self
 
 from azure.core.pipeline import policies
 from azure.mgmt.core import ARMPipelineClient
@@ -55,7 +56,7 @@ class StorageManagementClient(MultiApiClientMixin, _SDKClient):
     :keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present.
     """
 
-    DEFAULT_API_VERSION = '2023-05-01'
+    DEFAULT_API_VERSION = '2024-01-01'
     _PROFILE_TAG = "azure.mgmt.storage.StorageManagementClient"
     LATEST_PROFILE = ProfileDefinition({
         _PROFILE_TAG: {
@@ -131,6 +132,7 @@ def models(cls, api_version=DEFAULT_API_VERSION):
            * 2022-09-01: :mod:`v2022_09_01.models<azure.mgmt.storage.v2022_09_01.models>`
            * 2023-01-01: :mod:`v2023_01_01.models<azure.mgmt.storage.v2023_01_01.models>`
            * 2023-05-01: :mod:`v2023_05_01.models<azure.mgmt.storage.v2023_05_01.models>`
+           * 2024-01-01: :mod:`v2024_01_01.models<azure.mgmt.storage.v2024_01_01.models>`
         """
         if api_version == '2015-06-15':
             from .v2015_06_15 import models
@@ -198,6 +200,9 @@ def models(cls, api_version=DEFAULT_API_VERSION):
         elif api_version == '2023-05-01':
             from .v2023_05_01 import models
             return models
+        elif api_version == '2024-01-01':
+            from .v2024_01_01 import models
+            return models
         raise ValueError("API version {} is not available".format(api_version))
 
     @property
@@ -221,6 +226,7 @@ def blob_containers(self):
            * 2022-09-01: :class:`BlobContainersOperations<azure.mgmt.storage.v2022_09_01.operations.BlobContainersOperations>`
            * 2023-01-01: :class:`BlobContainersOperations<azure.mgmt.storage.v2023_01_01.operations.BlobContainersOperations>`
            * 2023-05-01: :class:`BlobContainersOperations<azure.mgmt.storage.v2023_05_01.operations.BlobContainersOperations>`
+           * 2024-01-01: :class:`BlobContainersOperations<azure.mgmt.storage.v2024_01_01.operations.BlobContainersOperations>`
         """
         api_version = self._get_api_version('blob_containers')
         if api_version == '2018-02-01':
@@ -257,6 +263,8 @@ def blob_containers(self):
             from .v2023_01_01.operations import BlobContainersOperations as OperationClass
         elif api_version == '2023-05-01':
             from .v2023_05_01.operations import BlobContainersOperations as OperationClass
+        elif api_version == '2024-01-01':
+            from .v2024_01_01.operations import BlobContainersOperations as OperationClass
         else:
             raise ValueError("API version {} does not have operation group 'blob_containers'".format(api_version))
         self._config.api_version = api_version
@@ -278,6 +286,7 @@ def blob_inventory_policies(self):
            * 2022-09-01: :class:`BlobInventoryPoliciesOperations<azure.mgmt.storage.v2022_09_01.operations.BlobInventoryPoliciesOperations>`
            * 2023-01-01: :class:`BlobInventoryPoliciesOperations<azure.mgmt.storage.v2023_01_01.operations.BlobInventoryPoliciesOperations>`
            * 2023-05-01: :class:`BlobInventoryPoliciesOperations<azure.mgmt.storage.v2023_05_01.operations.BlobInventoryPoliciesOperations>`
+           * 2024-01-01: :class:`BlobInventoryPoliciesOperations<azure.mgmt.storage.v2024_01_01.operations.BlobInventoryPoliciesOperations>`
         """
         api_version = self._get_api_version('blob_inventory_policies')
         if api_version == '2019-06-01':
@@ -304,6 +313,8 @@ def blob_inventory_policies(self):
             from .v2023_01_01.operations import BlobInventoryPoliciesOperations as OperationClass
         elif api_version == '2023-05-01':
             from .v2023_05_01.operations import BlobInventoryPoliciesOperations as OperationClass
+        elif api_version == '2024-01-01':
+            from .v2024_01_01.operations import BlobInventoryPoliciesOperations as OperationClass
         else:
             raise ValueError("API version {} does not have operation group 'blob_inventory_policies'".format(api_version))
         self._config.api_version = api_version
@@ -328,6 +339,7 @@ def blob_services(self):
            * 2022-09-01: :class:`BlobServicesOperations<azure.mgmt.storage.v2022_09_01.operations.BlobServicesOperations>`
            * 2023-01-01: :class:`BlobServicesOperations<azure.mgmt.storage.v2023_01_01.operations.BlobServicesOperations>`
            * 2023-05-01: :class:`BlobServicesOperations<azure.mgmt.storage.v2023_05_01.operations.BlobServicesOperations>`
+           * 2024-01-01: :class:`BlobServicesOperations<azure.mgmt.storage.v2024_01_01.operations.BlobServicesOperations>`
         """
         api_version = self._get_api_version('blob_services')
         if api_version == '2018-07-01':
@@ -360,6 +372,8 @@ def blob_services(self):
             from .v2023_01_01.operations import BlobServicesOperations as OperationClass
         elif api_version == '2023-05-01':
             from .v2023_05_01.operations import BlobServicesOperations as OperationClass
+        elif api_version == '2024-01-01':
+            from .v2024_01_01.operations import BlobServicesOperations as OperationClass
         else:
             raise ValueError("API version {} does not have operation group 'blob_services'".format(api_version))
         self._config.api_version = api_version
@@ -380,6 +394,7 @@ def deleted_accounts(self):
            * 2022-09-01: :class:`DeletedAccountsOperations<azure.mgmt.storage.v2022_09_01.operations.DeletedAccountsOperations>`
            * 2023-01-01: :class:`DeletedAccountsOperations<azure.mgmt.storage.v2023_01_01.operations.DeletedAccountsOperations>`
            * 2023-05-01: :class:`DeletedAccountsOperations<azure.mgmt.storage.v2023_05_01.operations.DeletedAccountsOperations>`
+           * 2024-01-01: :class:`DeletedAccountsOperations<azure.mgmt.storage.v2024_01_01.operations.DeletedAccountsOperations>`
         """
         api_version = self._get_api_version('deleted_accounts')
         if api_version == '2020-08-01-preview':
@@ -404,6 +419,8 @@ def deleted_accounts(self):
             from .v2023_01_01.operations import DeletedAccountsOperations as OperationClass
         elif api_version == '2023-05-01':
             from .v2023_05_01.operations import DeletedAccountsOperations as OperationClass
+        elif api_version == '2024-01-01':
+            from .v2024_01_01.operations import DeletedAccountsOperations as OperationClass
         else:
             raise ValueError("API version {} does not have operation group 'deleted_accounts'".format(api_version))
         self._config.api_version = api_version
@@ -425,6 +442,7 @@ def encryption_scopes(self):
            * 2022-09-01: :class:`EncryptionScopesOperations<azure.mgmt.storage.v2022_09_01.operations.EncryptionScopesOperations>`
            * 2023-01-01: :class:`EncryptionScopesOperations<azure.mgmt.storage.v2023_01_01.operations.EncryptionScopesOperations>`
            * 2023-05-01: :class:`EncryptionScopesOperations<azure.mgmt.storage.v2023_05_01.operations.EncryptionScopesOperations>`
+           * 2024-01-01: :class:`EncryptionScopesOperations<azure.mgmt.storage.v2024_01_01.operations.EncryptionScopesOperations>`
         """
         api_version = self._get_api_version('encryption_scopes')
         if api_version == '2019-06-01':
@@ -451,6 +469,8 @@ def encryption_scopes(self):
             from .v2023_01_01.operations import EncryptionScopesOperations as OperationClass
         elif api_version == '2023-05-01':
             from .v2023_05_01.operations import EncryptionScopesOperations as OperationClass
+        elif api_version == '2024-01-01':
+            from .v2024_01_01.operations import EncryptionScopesOperations as OperationClass
         else:
             raise ValueError("API version {} does not have operation group 'encryption_scopes'".format(api_version))
         self._config.api_version = api_version
@@ -473,6 +493,7 @@ def file_services(self):
            * 2022-09-01: :class:`FileServicesOperations<azure.mgmt.storage.v2022_09_01.operations.FileServicesOperations>`
            * 2023-01-01: :class:`FileServicesOperations<azure.mgmt.storage.v2023_01_01.operations.FileServicesOperations>`
            * 2023-05-01: :class:`FileServicesOperations<azure.mgmt.storage.v2023_05_01.operations.FileServicesOperations>`
+           * 2024-01-01: :class:`FileServicesOperations<azure.mgmt.storage.v2024_01_01.operations.FileServicesOperations>`
         """
         api_version = self._get_api_version('file_services')
         if api_version == '2019-04-01':
@@ -501,6 +522,8 @@ def file_services(self):
             from .v2023_01_01.operations import FileServicesOperations as OperationClass
         elif api_version == '2023-05-01':
             from .v2023_05_01.operations import FileServicesOperations as OperationClass
+        elif api_version == '2024-01-01':
+            from .v2024_01_01.operations import FileServicesOperations as OperationClass
         else:
             raise ValueError("API version {} does not have operation group 'file_services'".format(api_version))
         self._config.api_version = api_version
@@ -523,6 +546,7 @@ def file_shares(self):
            * 2022-09-01: :class:`FileSharesOperations<azure.mgmt.storage.v2022_09_01.operations.FileSharesOperations>`
            * 2023-01-01: :class:`FileSharesOperations<azure.mgmt.storage.v2023_01_01.operations.FileSharesOperations>`
            * 2023-05-01: :class:`FileSharesOperations<azure.mgmt.storage.v2023_05_01.operations.FileSharesOperations>`
+           * 2024-01-01: :class:`FileSharesOperations<azure.mgmt.storage.v2024_01_01.operations.FileSharesOperations>`
         """
         api_version = self._get_api_version('file_shares')
         if api_version == '2019-04-01':
@@ -551,6 +575,8 @@ def file_shares(self):
             from .v2023_01_01.operations import FileSharesOperations as OperationClass
         elif api_version == '2023-05-01':
             from .v2023_05_01.operations import FileSharesOperations as OperationClass
+        elif api_version == '2024-01-01':
+            from .v2024_01_01.operations import FileSharesOperations as OperationClass
         else:
             raise ValueError("API version {} does not have operation group 'file_shares'".format(api_version))
         self._config.api_version = api_version
@@ -566,6 +592,7 @@ def local_users(self):
            * 2022-09-01: :class:`LocalUsersOperations<azure.mgmt.storage.v2022_09_01.operations.LocalUsersOperations>`
            * 2023-01-01: :class:`LocalUsersOperations<azure.mgmt.storage.v2023_01_01.operations.LocalUsersOperations>`
            * 2023-05-01: :class:`LocalUsersOperations<azure.mgmt.storage.v2023_05_01.operations.LocalUsersOperations>`
+           * 2024-01-01: :class:`LocalUsersOperations<azure.mgmt.storage.v2024_01_01.operations.LocalUsersOperations>`
         """
         api_version = self._get_api_version('local_users')
         if api_version == '2021-08-01':
@@ -580,6 +607,8 @@ def local_users(self):
             from .v2023_01_01.operations import LocalUsersOperations as OperationClass
         elif api_version == '2023-05-01':
             from .v2023_05_01.operations import LocalUsersOperations as OperationClass
+        elif api_version == '2024-01-01':
+            from .v2024_01_01.operations import LocalUsersOperations as OperationClass
         else:
             raise ValueError("API version {} does not have operation group 'local_users'".format(api_version))
         self._config.api_version = api_version
@@ -604,6 +633,7 @@ def management_policies(self):
            * 2022-09-01: :class:`ManagementPoliciesOperations<azure.mgmt.storage.v2022_09_01.operations.ManagementPoliciesOperations>`
            * 2023-01-01: :class:`ManagementPoliciesOperations<azure.mgmt.storage.v2023_01_01.operations.ManagementPoliciesOperations>`
            * 2023-05-01: :class:`ManagementPoliciesOperations<azure.mgmt.storage.v2023_05_01.operations.ManagementPoliciesOperations>`
+           * 2024-01-01: :class:`ManagementPoliciesOperations<azure.mgmt.storage.v2024_01_01.operations.ManagementPoliciesOperations>`
         """
         api_version = self._get_api_version('management_policies')
         if api_version == '2018-03-01-preview':
@@ -636,6 +666,8 @@ def management_policies(self):
             from .v2023_01_01.operations import ManagementPoliciesOperations as OperationClass
         elif api_version == '2023-05-01':
             from .v2023_05_01.operations import ManagementPoliciesOperations as OperationClass
+        elif api_version == '2024-01-01':
+            from .v2024_01_01.operations import ManagementPoliciesOperations as OperationClass
         else:
             raise ValueError("API version {} does not have operation group 'management_policies'".format(api_version))
         self._config.api_version = api_version
@@ -646,10 +678,13 @@ def network_security_perimeter_configurations(self):
         """Instance depends on the API version:
 
            * 2023-05-01: :class:`NetworkSecurityPerimeterConfigurationsOperations<azure.mgmt.storage.v2023_05_01.operations.NetworkSecurityPerimeterConfigurationsOperations>`
+           * 2024-01-01: :class:`NetworkSecurityPerimeterConfigurationsOperations<azure.mgmt.storage.v2024_01_01.operations.NetworkSecurityPerimeterConfigurationsOperations>`
         """
         api_version = self._get_api_version('network_security_perimeter_configurations')
         if api_version == '2023-05-01':
             from .v2023_05_01.operations import NetworkSecurityPerimeterConfigurationsOperations as OperationClass
+        elif api_version == '2024-01-01':
+            from .v2024_01_01.operations import NetworkSecurityPerimeterConfigurationsOperations as OperationClass
         else:
             raise ValueError("API version {} does not have operation group 'network_security_perimeter_configurations'".format(api_version))
         self._config.api_version = api_version
@@ -671,6 +706,7 @@ def object_replication_policies(self):
            * 2022-09-01: :class:`ObjectReplicationPoliciesOperations<azure.mgmt.storage.v2022_09_01.operations.ObjectReplicationPoliciesOperations>`
            * 2023-01-01: :class:`ObjectReplicationPoliciesOperations<azure.mgmt.storage.v2023_01_01.operations.ObjectReplicationPoliciesOperations>`
            * 2023-05-01: :class:`ObjectReplicationPoliciesOperations<azure.mgmt.storage.v2023_05_01.operations.ObjectReplicationPoliciesOperations>`
+           * 2024-01-01: :class:`ObjectReplicationPoliciesOperations<azure.mgmt.storage.v2024_01_01.operations.ObjectReplicationPoliciesOperations>`
         """
         api_version = self._get_api_version('object_replication_policies')
         if api_version == '2019-06-01':
@@ -697,6 +733,8 @@ def object_replication_policies(self):
             from .v2023_01_01.operations import ObjectReplicationPoliciesOperations as OperationClass
         elif api_version == '2023-05-01':
             from .v2023_05_01.operations import ObjectReplicationPoliciesOperations as OperationClass
+        elif api_version == '2024-01-01':
+            from .v2024_01_01.operations import ObjectReplicationPoliciesOperations as OperationClass
         else:
             raise ValueError("API version {} does not have operation group 'object_replication_policies'".format(api_version))
         self._config.api_version = api_version
@@ -725,6 +763,7 @@ def operations(self):
            * 2022-09-01: :class:`Operations<azure.mgmt.storage.v2022_09_01.operations.Operations>`
            * 2023-01-01: :class:`Operations<azure.mgmt.storage.v2023_01_01.operations.Operations>`
            * 2023-05-01: :class:`Operations<azure.mgmt.storage.v2023_05_01.operations.Operations>`
+           * 2024-01-01: :class:`Operations<azure.mgmt.storage.v2024_01_01.operations.Operations>`
         """
         api_version = self._get_api_version('operations')
         if api_version == '2017-06-01':
@@ -765,6 +804,8 @@ def operations(self):
             from .v2023_01_01.operations import Operations as OperationClass
         elif api_version == '2023-05-01':
             from .v2023_05_01.operations import Operations as OperationClass
+        elif api_version == '2024-01-01':
+            from .v2024_01_01.operations import Operations as OperationClass
         else:
             raise ValueError("API version {} does not have operation group 'operations'".format(api_version))
         self._config.api_version = api_version
@@ -786,6 +827,7 @@ def private_endpoint_connections(self):
            * 2022-09-01: :class:`PrivateEndpointConnectionsOperations<azure.mgmt.storage.v2022_09_01.operations.PrivateEndpointConnectionsOperations>`
            * 2023-01-01: :class:`PrivateEndpointConnectionsOperations<azure.mgmt.storage.v2023_01_01.operations.PrivateEndpointConnectionsOperations>`
            * 2023-05-01: :class:`PrivateEndpointConnectionsOperations<azure.mgmt.storage.v2023_05_01.operations.PrivateEndpointConnectionsOperations>`
+           * 2024-01-01: :class:`PrivateEndpointConnectionsOperations<azure.mgmt.storage.v2024_01_01.operations.PrivateEndpointConnectionsOperations>`
         """
         api_version = self._get_api_version('private_endpoint_connections')
         if api_version == '2019-06-01':
@@ -812,6 +854,8 @@ def private_endpoint_connections(self):
             from .v2023_01_01.operations import PrivateEndpointConnectionsOperations as OperationClass
         elif api_version == '2023-05-01':
             from .v2023_05_01.operations import PrivateEndpointConnectionsOperations as OperationClass
+        elif api_version == '2024-01-01':
+            from .v2024_01_01.operations import PrivateEndpointConnectionsOperations as OperationClass
         else:
             raise ValueError("API version {} does not have operation group 'private_endpoint_connections'".format(api_version))
         self._config.api_version = api_version
@@ -833,6 +877,7 @@ def private_link_resources(self):
            * 2022-09-01: :class:`PrivateLinkResourcesOperations<azure.mgmt.storage.v2022_09_01.operations.PrivateLinkResourcesOperations>`
            * 2023-01-01: :class:`PrivateLinkResourcesOperations<azure.mgmt.storage.v2023_01_01.operations.PrivateLinkResourcesOperations>`
            * 2023-05-01: :class:`PrivateLinkResourcesOperations<azure.mgmt.storage.v2023_05_01.operations.PrivateLinkResourcesOperations>`
+           * 2024-01-01: :class:`PrivateLinkResourcesOperations<azure.mgmt.storage.v2024_01_01.operations.PrivateLinkResourcesOperations>`
         """
         api_version = self._get_api_version('private_link_resources')
         if api_version == '2019-06-01':
@@ -859,6 +904,8 @@ def private_link_resources(self):
             from .v2023_01_01.operations import PrivateLinkResourcesOperations as OperationClass
         elif api_version == '2023-05-01':
             from .v2023_05_01.operations import PrivateLinkResourcesOperations as OperationClass
+        elif api_version == '2024-01-01':
+            from .v2024_01_01.operations import PrivateLinkResourcesOperations as OperationClass
         else:
             raise ValueError("API version {} does not have operation group 'private_link_resources'".format(api_version))
         self._config.api_version = api_version
@@ -880,6 +927,7 @@ def queue(self):
            * 2022-09-01: :class:`QueueOperations<azure.mgmt.storage.v2022_09_01.operations.QueueOperations>`
            * 2023-01-01: :class:`QueueOperations<azure.mgmt.storage.v2023_01_01.operations.QueueOperations>`
            * 2023-05-01: :class:`QueueOperations<azure.mgmt.storage.v2023_05_01.operations.QueueOperations>`
+           * 2024-01-01: :class:`QueueOperations<azure.mgmt.storage.v2024_01_01.operations.QueueOperations>`
         """
         api_version = self._get_api_version('queue')
         if api_version == '2019-06-01':
@@ -906,6 +954,8 @@ def queue(self):
             from .v2023_01_01.operations import QueueOperations as OperationClass
         elif api_version == '2023-05-01':
             from .v2023_05_01.operations import QueueOperations as OperationClass
+        elif api_version == '2024-01-01':
+            from .v2024_01_01.operations import QueueOperations as OperationClass
         else:
             raise ValueError("API version {} does not have operation group 'queue'".format(api_version))
         self._config.api_version = api_version
@@ -927,6 +977,7 @@ def queue_services(self):
            * 2022-09-01: :class:`QueueServicesOperations<azure.mgmt.storage.v2022_09_01.operations.QueueServicesOperations>`
            * 2023-01-01: :class:`QueueServicesOperations<azure.mgmt.storage.v2023_01_01.operations.QueueServicesOperations>`
            * 2023-05-01: :class:`QueueServicesOperations<azure.mgmt.storage.v2023_05_01.operations.QueueServicesOperations>`
+           * 2024-01-01: :class:`QueueServicesOperations<azure.mgmt.storage.v2024_01_01.operations.QueueServicesOperations>`
         """
         api_version = self._get_api_version('queue_services')
         if api_version == '2019-06-01':
@@ -953,6 +1004,8 @@ def queue_services(self):
             from .v2023_01_01.operations import QueueServicesOperations as OperationClass
         elif api_version == '2023-05-01':
             from .v2023_05_01.operations import QueueServicesOperations as OperationClass
+        elif api_version == '2024-01-01':
+            from .v2024_01_01.operations import QueueServicesOperations as OperationClass
         else:
             raise ValueError("API version {} does not have operation group 'queue_services'".format(api_version))
         self._config.api_version = api_version
@@ -981,6 +1034,7 @@ def skus(self):
            * 2022-09-01: :class:`SkusOperations<azure.mgmt.storage.v2022_09_01.operations.SkusOperations>`
            * 2023-01-01: :class:`SkusOperations<azure.mgmt.storage.v2023_01_01.operations.SkusOperations>`
            * 2023-05-01: :class:`SkusOperations<azure.mgmt.storage.v2023_05_01.operations.SkusOperations>`
+           * 2024-01-01: :class:`SkusOperations<azure.mgmt.storage.v2024_01_01.operations.SkusOperations>`
         """
         api_version = self._get_api_version('skus')
         if api_version == '2017-06-01':
@@ -1021,6 +1075,8 @@ def skus(self):
             from .v2023_01_01.operations import SkusOperations as OperationClass
         elif api_version == '2023-05-01':
             from .v2023_05_01.operations import SkusOperations as OperationClass
+        elif api_version == '2024-01-01':
+            from .v2024_01_01.operations import SkusOperations as OperationClass
         else:
             raise ValueError("API version {} does not have operation group 'skus'".format(api_version))
         self._config.api_version = api_version
@@ -1052,6 +1108,7 @@ def storage_accounts(self):
            * 2022-09-01: :class:`StorageAccountsOperations<azure.mgmt.storage.v2022_09_01.operations.StorageAccountsOperations>`
            * 2023-01-01: :class:`StorageAccountsOperations<azure.mgmt.storage.v2023_01_01.operations.StorageAccountsOperations>`
            * 2023-05-01: :class:`StorageAccountsOperations<azure.mgmt.storage.v2023_05_01.operations.StorageAccountsOperations>`
+           * 2024-01-01: :class:`StorageAccountsOperations<azure.mgmt.storage.v2024_01_01.operations.StorageAccountsOperations>`
         """
         api_version = self._get_api_version('storage_accounts')
         if api_version == '2015-06-15':
@@ -1098,6 +1155,8 @@ def storage_accounts(self):
             from .v2023_01_01.operations import StorageAccountsOperations as OperationClass
         elif api_version == '2023-05-01':
             from .v2023_05_01.operations import StorageAccountsOperations as OperationClass
+        elif api_version == '2024-01-01':
+            from .v2024_01_01.operations import StorageAccountsOperations as OperationClass
         else:
             raise ValueError("API version {} does not have operation group 'storage_accounts'".format(api_version))
         self._config.api_version = api_version
@@ -1108,10 +1167,13 @@ def storage_task_assignment_instances_report(self):
         """Instance depends on the API version:
 
            * 2023-05-01: :class:`StorageTaskAssignmentInstancesReportOperations<azure.mgmt.storage.v2023_05_01.operations.StorageTaskAssignmentInstancesReportOperations>`
+           * 2024-01-01: :class:`StorageTaskAssignmentInstancesReportOperations<azure.mgmt.storage.v2024_01_01.operations.StorageTaskAssignmentInstancesReportOperations>`
         """
         api_version = self._get_api_version('storage_task_assignment_instances_report')
         if api_version == '2023-05-01':
             from .v2023_05_01.operations import StorageTaskAssignmentInstancesReportOperations as OperationClass
+        elif api_version == '2024-01-01':
+            from .v2024_01_01.operations import StorageTaskAssignmentInstancesReportOperations as OperationClass
         else:
             raise ValueError("API version {} does not have operation group 'storage_task_assignment_instances_report'".format(api_version))
         self._config.api_version = api_version
@@ -1122,10 +1184,13 @@ def storage_task_assignments(self):
         """Instance depends on the API version:
 
            * 2023-05-01: :class:`StorageTaskAssignmentsOperations<azure.mgmt.storage.v2023_05_01.operations.StorageTaskAssignmentsOperations>`
+           * 2024-01-01: :class:`StorageTaskAssignmentsOperations<azure.mgmt.storage.v2024_01_01.operations.StorageTaskAssignmentsOperations>`
         """
         api_version = self._get_api_version('storage_task_assignments')
         if api_version == '2023-05-01':
             from .v2023_05_01.operations import StorageTaskAssignmentsOperations as OperationClass
+        elif api_version == '2024-01-01':
+            from .v2024_01_01.operations import StorageTaskAssignmentsOperations as OperationClass
         else:
             raise ValueError("API version {} does not have operation group 'storage_task_assignments'".format(api_version))
         self._config.api_version = api_version
@@ -1136,10 +1201,13 @@ def storage_task_assignments_instances_report(self):
         """Instance depends on the API version:
 
            * 2023-05-01: :class:`StorageTaskAssignmentsInstancesReportOperations<azure.mgmt.storage.v2023_05_01.operations.StorageTaskAssignmentsInstancesReportOperations>`
+           * 2024-01-01: :class:`StorageTaskAssignmentsInstancesReportOperations<azure.mgmt.storage.v2024_01_01.operations.StorageTaskAssignmentsInstancesReportOperations>`
         """
         api_version = self._get_api_version('storage_task_assignments_instances_report')
         if api_version == '2023-05-01':
             from .v2023_05_01.operations import StorageTaskAssignmentsInstancesReportOperations as OperationClass
+        elif api_version == '2024-01-01':
+            from .v2024_01_01.operations import StorageTaskAssignmentsInstancesReportOperations as OperationClass
         else:
             raise ValueError("API version {} does not have operation group 'storage_task_assignments_instances_report'".format(api_version))
         self._config.api_version = api_version
@@ -1161,6 +1229,7 @@ def table(self):
            * 2022-09-01: :class:`TableOperations<azure.mgmt.storage.v2022_09_01.operations.TableOperations>`
            * 2023-01-01: :class:`TableOperations<azure.mgmt.storage.v2023_01_01.operations.TableOperations>`
            * 2023-05-01: :class:`TableOperations<azure.mgmt.storage.v2023_05_01.operations.TableOperations>`
+           * 2024-01-01: :class:`TableOperations<azure.mgmt.storage.v2024_01_01.operations.TableOperations>`
         """
         api_version = self._get_api_version('table')
         if api_version == '2019-06-01':
@@ -1187,6 +1256,8 @@ def table(self):
             from .v2023_01_01.operations import TableOperations as OperationClass
         elif api_version == '2023-05-01':
             from .v2023_05_01.operations import TableOperations as OperationClass
+        elif api_version == '2024-01-01':
+            from .v2024_01_01.operations import TableOperations as OperationClass
         else:
             raise ValueError("API version {} does not have operation group 'table'".format(api_version))
         self._config.api_version = api_version
@@ -1208,6 +1279,7 @@ def table_services(self):
            * 2022-09-01: :class:`TableServicesOperations<azure.mgmt.storage.v2022_09_01.operations.TableServicesOperations>`
            * 2023-01-01: :class:`TableServicesOperations<azure.mgmt.storage.v2023_01_01.operations.TableServicesOperations>`
            * 2023-05-01: :class:`TableServicesOperations<azure.mgmt.storage.v2023_05_01.operations.TableServicesOperations>`
+           * 2024-01-01: :class:`TableServicesOperations<azure.mgmt.storage.v2024_01_01.operations.TableServicesOperations>`
         """
         api_version = self._get_api_version('table_services')
         if api_version == '2019-06-01':
@@ -1234,6 +1306,8 @@ def table_services(self):
             from .v2023_01_01.operations import TableServicesOperations as OperationClass
         elif api_version == '2023-05-01':
             from .v2023_05_01.operations import TableServicesOperations as OperationClass
+        elif api_version == '2024-01-01':
+            from .v2024_01_01.operations import TableServicesOperations as OperationClass
         else:
             raise ValueError("API version {} does not have operation group 'table_services'".format(api_version))
         self._config.api_version = api_version
@@ -1288,6 +1362,7 @@ def usages(self):
            * 2022-09-01: :class:`UsagesOperations<azure.mgmt.storage.v2022_09_01.operations.UsagesOperations>`
            * 2023-01-01: :class:`UsagesOperations<azure.mgmt.storage.v2023_01_01.operations.UsagesOperations>`
            * 2023-05-01: :class:`UsagesOperations<azure.mgmt.storage.v2023_05_01.operations.UsagesOperations>`
+           * 2024-01-01: :class:`UsagesOperations<azure.mgmt.storage.v2024_01_01.operations.UsagesOperations>`
         """
         api_version = self._get_api_version('usages')
         if api_version == '2018-03-01-preview':
@@ -1322,6 +1397,8 @@ def usages(self):
             from .v2023_01_01.operations import UsagesOperations as OperationClass
         elif api_version == '2023-05-01':
             from .v2023_05_01.operations import UsagesOperations as OperationClass
+        elif api_version == '2024-01-01':
+            from .v2024_01_01.operations import UsagesOperations as OperationClass
         else:
             raise ValueError("API version {} does not have operation group 'usages'".format(api_version))
         self._config.api_version = api_version
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/aio/_storage_management_client.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/aio/_storage_management_client.py
index 7b8be2ef1c9d..89bb6a3e2a21 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/aio/_storage_management_client.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/aio/_storage_management_client.py
@@ -10,6 +10,7 @@
 # --------------------------------------------------------------------------
 
 from typing import Any, Optional, TYPE_CHECKING
+from typing_extensions import Self
 
 from azure.core.pipeline import policies
 from azure.mgmt.core import AsyncARMPipelineClient
@@ -55,7 +56,7 @@ class StorageManagementClient(MultiApiClientMixin, _SDKClient):
     :keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present.
     """
 
-    DEFAULT_API_VERSION = '2023-05-01'
+    DEFAULT_API_VERSION = '2024-01-01'
     _PROFILE_TAG = "azure.mgmt.storage.StorageManagementClient"
     LATEST_PROFILE = ProfileDefinition({
         _PROFILE_TAG: {
@@ -131,6 +132,7 @@ def models(cls, api_version=DEFAULT_API_VERSION):
            * 2022-09-01: :mod:`v2022_09_01.models<azure.mgmt.storage.v2022_09_01.models>`
            * 2023-01-01: :mod:`v2023_01_01.models<azure.mgmt.storage.v2023_01_01.models>`
            * 2023-05-01: :mod:`v2023_05_01.models<azure.mgmt.storage.v2023_05_01.models>`
+           * 2024-01-01: :mod:`v2024_01_01.models<azure.mgmt.storage.v2024_01_01.models>`
         """
         if api_version == '2015-06-15':
             from ..v2015_06_15 import models
@@ -198,6 +200,9 @@ def models(cls, api_version=DEFAULT_API_VERSION):
         elif api_version == '2023-05-01':
             from ..v2023_05_01 import models
             return models
+        elif api_version == '2024-01-01':
+            from ..v2024_01_01 import models
+            return models
         raise ValueError("API version {} is not available".format(api_version))
 
     @property
@@ -221,6 +226,7 @@ def blob_containers(self):
            * 2022-09-01: :class:`BlobContainersOperations<azure.mgmt.storage.v2022_09_01.aio.operations.BlobContainersOperations>`
            * 2023-01-01: :class:`BlobContainersOperations<azure.mgmt.storage.v2023_01_01.aio.operations.BlobContainersOperations>`
            * 2023-05-01: :class:`BlobContainersOperations<azure.mgmt.storage.v2023_05_01.aio.operations.BlobContainersOperations>`
+           * 2024-01-01: :class:`BlobContainersOperations<azure.mgmt.storage.v2024_01_01.aio.operations.BlobContainersOperations>`
         """
         api_version = self._get_api_version('blob_containers')
         if api_version == '2018-02-01':
@@ -257,6 +263,8 @@ def blob_containers(self):
             from ..v2023_01_01.aio.operations import BlobContainersOperations as OperationClass
         elif api_version == '2023-05-01':
             from ..v2023_05_01.aio.operations import BlobContainersOperations as OperationClass
+        elif api_version == '2024-01-01':
+            from ..v2024_01_01.aio.operations import BlobContainersOperations as OperationClass
         else:
             raise ValueError("API version {} does not have operation group 'blob_containers'".format(api_version))
         self._config.api_version = api_version
@@ -278,6 +286,7 @@ def blob_inventory_policies(self):
            * 2022-09-01: :class:`BlobInventoryPoliciesOperations<azure.mgmt.storage.v2022_09_01.aio.operations.BlobInventoryPoliciesOperations>`
            * 2023-01-01: :class:`BlobInventoryPoliciesOperations<azure.mgmt.storage.v2023_01_01.aio.operations.BlobInventoryPoliciesOperations>`
            * 2023-05-01: :class:`BlobInventoryPoliciesOperations<azure.mgmt.storage.v2023_05_01.aio.operations.BlobInventoryPoliciesOperations>`
+           * 2024-01-01: :class:`BlobInventoryPoliciesOperations<azure.mgmt.storage.v2024_01_01.aio.operations.BlobInventoryPoliciesOperations>`
         """
         api_version = self._get_api_version('blob_inventory_policies')
         if api_version == '2019-06-01':
@@ -304,6 +313,8 @@ def blob_inventory_policies(self):
             from ..v2023_01_01.aio.operations import BlobInventoryPoliciesOperations as OperationClass
         elif api_version == '2023-05-01':
             from ..v2023_05_01.aio.operations import BlobInventoryPoliciesOperations as OperationClass
+        elif api_version == '2024-01-01':
+            from ..v2024_01_01.aio.operations import BlobInventoryPoliciesOperations as OperationClass
         else:
             raise ValueError("API version {} does not have operation group 'blob_inventory_policies'".format(api_version))
         self._config.api_version = api_version
@@ -328,6 +339,7 @@ def blob_services(self):
            * 2022-09-01: :class:`BlobServicesOperations<azure.mgmt.storage.v2022_09_01.aio.operations.BlobServicesOperations>`
            * 2023-01-01: :class:`BlobServicesOperations<azure.mgmt.storage.v2023_01_01.aio.operations.BlobServicesOperations>`
            * 2023-05-01: :class:`BlobServicesOperations<azure.mgmt.storage.v2023_05_01.aio.operations.BlobServicesOperations>`
+           * 2024-01-01: :class:`BlobServicesOperations<azure.mgmt.storage.v2024_01_01.aio.operations.BlobServicesOperations>`
         """
         api_version = self._get_api_version('blob_services')
         if api_version == '2018-07-01':
@@ -360,6 +372,8 @@ def blob_services(self):
             from ..v2023_01_01.aio.operations import BlobServicesOperations as OperationClass
         elif api_version == '2023-05-01':
             from ..v2023_05_01.aio.operations import BlobServicesOperations as OperationClass
+        elif api_version == '2024-01-01':
+            from ..v2024_01_01.aio.operations import BlobServicesOperations as OperationClass
         else:
             raise ValueError("API version {} does not have operation group 'blob_services'".format(api_version))
         self._config.api_version = api_version
@@ -380,6 +394,7 @@ def deleted_accounts(self):
            * 2022-09-01: :class:`DeletedAccountsOperations<azure.mgmt.storage.v2022_09_01.aio.operations.DeletedAccountsOperations>`
            * 2023-01-01: :class:`DeletedAccountsOperations<azure.mgmt.storage.v2023_01_01.aio.operations.DeletedAccountsOperations>`
            * 2023-05-01: :class:`DeletedAccountsOperations<azure.mgmt.storage.v2023_05_01.aio.operations.DeletedAccountsOperations>`
+           * 2024-01-01: :class:`DeletedAccountsOperations<azure.mgmt.storage.v2024_01_01.aio.operations.DeletedAccountsOperations>`
         """
         api_version = self._get_api_version('deleted_accounts')
         if api_version == '2020-08-01-preview':
@@ -404,6 +419,8 @@ def deleted_accounts(self):
             from ..v2023_01_01.aio.operations import DeletedAccountsOperations as OperationClass
         elif api_version == '2023-05-01':
             from ..v2023_05_01.aio.operations import DeletedAccountsOperations as OperationClass
+        elif api_version == '2024-01-01':
+            from ..v2024_01_01.aio.operations import DeletedAccountsOperations as OperationClass
         else:
             raise ValueError("API version {} does not have operation group 'deleted_accounts'".format(api_version))
         self._config.api_version = api_version
@@ -425,6 +442,7 @@ def encryption_scopes(self):
            * 2022-09-01: :class:`EncryptionScopesOperations<azure.mgmt.storage.v2022_09_01.aio.operations.EncryptionScopesOperations>`
            * 2023-01-01: :class:`EncryptionScopesOperations<azure.mgmt.storage.v2023_01_01.aio.operations.EncryptionScopesOperations>`
            * 2023-05-01: :class:`EncryptionScopesOperations<azure.mgmt.storage.v2023_05_01.aio.operations.EncryptionScopesOperations>`
+           * 2024-01-01: :class:`EncryptionScopesOperations<azure.mgmt.storage.v2024_01_01.aio.operations.EncryptionScopesOperations>`
         """
         api_version = self._get_api_version('encryption_scopes')
         if api_version == '2019-06-01':
@@ -451,6 +469,8 @@ def encryption_scopes(self):
             from ..v2023_01_01.aio.operations import EncryptionScopesOperations as OperationClass
         elif api_version == '2023-05-01':
             from ..v2023_05_01.aio.operations import EncryptionScopesOperations as OperationClass
+        elif api_version == '2024-01-01':
+            from ..v2024_01_01.aio.operations import EncryptionScopesOperations as OperationClass
         else:
             raise ValueError("API version {} does not have operation group 'encryption_scopes'".format(api_version))
         self._config.api_version = api_version
@@ -473,6 +493,7 @@ def file_services(self):
            * 2022-09-01: :class:`FileServicesOperations<azure.mgmt.storage.v2022_09_01.aio.operations.FileServicesOperations>`
            * 2023-01-01: :class:`FileServicesOperations<azure.mgmt.storage.v2023_01_01.aio.operations.FileServicesOperations>`
            * 2023-05-01: :class:`FileServicesOperations<azure.mgmt.storage.v2023_05_01.aio.operations.FileServicesOperations>`
+           * 2024-01-01: :class:`FileServicesOperations<azure.mgmt.storage.v2024_01_01.aio.operations.FileServicesOperations>`
         """
         api_version = self._get_api_version('file_services')
         if api_version == '2019-04-01':
@@ -501,6 +522,8 @@ def file_services(self):
             from ..v2023_01_01.aio.operations import FileServicesOperations as OperationClass
         elif api_version == '2023-05-01':
             from ..v2023_05_01.aio.operations import FileServicesOperations as OperationClass
+        elif api_version == '2024-01-01':
+            from ..v2024_01_01.aio.operations import FileServicesOperations as OperationClass
         else:
             raise ValueError("API version {} does not have operation group 'file_services'".format(api_version))
         self._config.api_version = api_version
@@ -523,6 +546,7 @@ def file_shares(self):
            * 2022-09-01: :class:`FileSharesOperations<azure.mgmt.storage.v2022_09_01.aio.operations.FileSharesOperations>`
            * 2023-01-01: :class:`FileSharesOperations<azure.mgmt.storage.v2023_01_01.aio.operations.FileSharesOperations>`
            * 2023-05-01: :class:`FileSharesOperations<azure.mgmt.storage.v2023_05_01.aio.operations.FileSharesOperations>`
+           * 2024-01-01: :class:`FileSharesOperations<azure.mgmt.storage.v2024_01_01.aio.operations.FileSharesOperations>`
         """
         api_version = self._get_api_version('file_shares')
         if api_version == '2019-04-01':
@@ -551,6 +575,8 @@ def file_shares(self):
             from ..v2023_01_01.aio.operations import FileSharesOperations as OperationClass
         elif api_version == '2023-05-01':
             from ..v2023_05_01.aio.operations import FileSharesOperations as OperationClass
+        elif api_version == '2024-01-01':
+            from ..v2024_01_01.aio.operations import FileSharesOperations as OperationClass
         else:
             raise ValueError("API version {} does not have operation group 'file_shares'".format(api_version))
         self._config.api_version = api_version
@@ -566,6 +592,7 @@ def local_users(self):
            * 2022-09-01: :class:`LocalUsersOperations<azure.mgmt.storage.v2022_09_01.aio.operations.LocalUsersOperations>`
            * 2023-01-01: :class:`LocalUsersOperations<azure.mgmt.storage.v2023_01_01.aio.operations.LocalUsersOperations>`
            * 2023-05-01: :class:`LocalUsersOperations<azure.mgmt.storage.v2023_05_01.aio.operations.LocalUsersOperations>`
+           * 2024-01-01: :class:`LocalUsersOperations<azure.mgmt.storage.v2024_01_01.aio.operations.LocalUsersOperations>`
         """
         api_version = self._get_api_version('local_users')
         if api_version == '2021-08-01':
@@ -580,6 +607,8 @@ def local_users(self):
             from ..v2023_01_01.aio.operations import LocalUsersOperations as OperationClass
         elif api_version == '2023-05-01':
             from ..v2023_05_01.aio.operations import LocalUsersOperations as OperationClass
+        elif api_version == '2024-01-01':
+            from ..v2024_01_01.aio.operations import LocalUsersOperations as OperationClass
         else:
             raise ValueError("API version {} does not have operation group 'local_users'".format(api_version))
         self._config.api_version = api_version
@@ -604,6 +633,7 @@ def management_policies(self):
            * 2022-09-01: :class:`ManagementPoliciesOperations<azure.mgmt.storage.v2022_09_01.aio.operations.ManagementPoliciesOperations>`
            * 2023-01-01: :class:`ManagementPoliciesOperations<azure.mgmt.storage.v2023_01_01.aio.operations.ManagementPoliciesOperations>`
            * 2023-05-01: :class:`ManagementPoliciesOperations<azure.mgmt.storage.v2023_05_01.aio.operations.ManagementPoliciesOperations>`
+           * 2024-01-01: :class:`ManagementPoliciesOperations<azure.mgmt.storage.v2024_01_01.aio.operations.ManagementPoliciesOperations>`
         """
         api_version = self._get_api_version('management_policies')
         if api_version == '2018-03-01-preview':
@@ -636,6 +666,8 @@ def management_policies(self):
             from ..v2023_01_01.aio.operations import ManagementPoliciesOperations as OperationClass
         elif api_version == '2023-05-01':
             from ..v2023_05_01.aio.operations import ManagementPoliciesOperations as OperationClass
+        elif api_version == '2024-01-01':
+            from ..v2024_01_01.aio.operations import ManagementPoliciesOperations as OperationClass
         else:
             raise ValueError("API version {} does not have operation group 'management_policies'".format(api_version))
         self._config.api_version = api_version
@@ -646,10 +678,13 @@ def network_security_perimeter_configurations(self):
         """Instance depends on the API version:
 
            * 2023-05-01: :class:`NetworkSecurityPerimeterConfigurationsOperations<azure.mgmt.storage.v2023_05_01.aio.operations.NetworkSecurityPerimeterConfigurationsOperations>`
+           * 2024-01-01: :class:`NetworkSecurityPerimeterConfigurationsOperations<azure.mgmt.storage.v2024_01_01.aio.operations.NetworkSecurityPerimeterConfigurationsOperations>`
         """
         api_version = self._get_api_version('network_security_perimeter_configurations')
         if api_version == '2023-05-01':
             from ..v2023_05_01.aio.operations import NetworkSecurityPerimeterConfigurationsOperations as OperationClass
+        elif api_version == '2024-01-01':
+            from ..v2024_01_01.aio.operations import NetworkSecurityPerimeterConfigurationsOperations as OperationClass
         else:
             raise ValueError("API version {} does not have operation group 'network_security_perimeter_configurations'".format(api_version))
         self._config.api_version = api_version
@@ -671,6 +706,7 @@ def object_replication_policies(self):
            * 2022-09-01: :class:`ObjectReplicationPoliciesOperations<azure.mgmt.storage.v2022_09_01.aio.operations.ObjectReplicationPoliciesOperations>`
            * 2023-01-01: :class:`ObjectReplicationPoliciesOperations<azure.mgmt.storage.v2023_01_01.aio.operations.ObjectReplicationPoliciesOperations>`
            * 2023-05-01: :class:`ObjectReplicationPoliciesOperations<azure.mgmt.storage.v2023_05_01.aio.operations.ObjectReplicationPoliciesOperations>`
+           * 2024-01-01: :class:`ObjectReplicationPoliciesOperations<azure.mgmt.storage.v2024_01_01.aio.operations.ObjectReplicationPoliciesOperations>`
         """
         api_version = self._get_api_version('object_replication_policies')
         if api_version == '2019-06-01':
@@ -697,6 +733,8 @@ def object_replication_policies(self):
             from ..v2023_01_01.aio.operations import ObjectReplicationPoliciesOperations as OperationClass
         elif api_version == '2023-05-01':
             from ..v2023_05_01.aio.operations import ObjectReplicationPoliciesOperations as OperationClass
+        elif api_version == '2024-01-01':
+            from ..v2024_01_01.aio.operations import ObjectReplicationPoliciesOperations as OperationClass
         else:
             raise ValueError("API version {} does not have operation group 'object_replication_policies'".format(api_version))
         self._config.api_version = api_version
@@ -725,6 +763,7 @@ def operations(self):
            * 2022-09-01: :class:`Operations<azure.mgmt.storage.v2022_09_01.aio.operations.Operations>`
            * 2023-01-01: :class:`Operations<azure.mgmt.storage.v2023_01_01.aio.operations.Operations>`
            * 2023-05-01: :class:`Operations<azure.mgmt.storage.v2023_05_01.aio.operations.Operations>`
+           * 2024-01-01: :class:`Operations<azure.mgmt.storage.v2024_01_01.aio.operations.Operations>`
         """
         api_version = self._get_api_version('operations')
         if api_version == '2017-06-01':
@@ -765,6 +804,8 @@ def operations(self):
             from ..v2023_01_01.aio.operations import Operations as OperationClass
         elif api_version == '2023-05-01':
             from ..v2023_05_01.aio.operations import Operations as OperationClass
+        elif api_version == '2024-01-01':
+            from ..v2024_01_01.aio.operations import Operations as OperationClass
         else:
             raise ValueError("API version {} does not have operation group 'operations'".format(api_version))
         self._config.api_version = api_version
@@ -786,6 +827,7 @@ def private_endpoint_connections(self):
            * 2022-09-01: :class:`PrivateEndpointConnectionsOperations<azure.mgmt.storage.v2022_09_01.aio.operations.PrivateEndpointConnectionsOperations>`
            * 2023-01-01: :class:`PrivateEndpointConnectionsOperations<azure.mgmt.storage.v2023_01_01.aio.operations.PrivateEndpointConnectionsOperations>`
            * 2023-05-01: :class:`PrivateEndpointConnectionsOperations<azure.mgmt.storage.v2023_05_01.aio.operations.PrivateEndpointConnectionsOperations>`
+           * 2024-01-01: :class:`PrivateEndpointConnectionsOperations<azure.mgmt.storage.v2024_01_01.aio.operations.PrivateEndpointConnectionsOperations>`
         """
         api_version = self._get_api_version('private_endpoint_connections')
         if api_version == '2019-06-01':
@@ -812,6 +854,8 @@ def private_endpoint_connections(self):
             from ..v2023_01_01.aio.operations import PrivateEndpointConnectionsOperations as OperationClass
         elif api_version == '2023-05-01':
             from ..v2023_05_01.aio.operations import PrivateEndpointConnectionsOperations as OperationClass
+        elif api_version == '2024-01-01':
+            from ..v2024_01_01.aio.operations import PrivateEndpointConnectionsOperations as OperationClass
         else:
             raise ValueError("API version {} does not have operation group 'private_endpoint_connections'".format(api_version))
         self._config.api_version = api_version
@@ -833,6 +877,7 @@ def private_link_resources(self):
            * 2022-09-01: :class:`PrivateLinkResourcesOperations<azure.mgmt.storage.v2022_09_01.aio.operations.PrivateLinkResourcesOperations>`
            * 2023-01-01: :class:`PrivateLinkResourcesOperations<azure.mgmt.storage.v2023_01_01.aio.operations.PrivateLinkResourcesOperations>`
            * 2023-05-01: :class:`PrivateLinkResourcesOperations<azure.mgmt.storage.v2023_05_01.aio.operations.PrivateLinkResourcesOperations>`
+           * 2024-01-01: :class:`PrivateLinkResourcesOperations<azure.mgmt.storage.v2024_01_01.aio.operations.PrivateLinkResourcesOperations>`
         """
         api_version = self._get_api_version('private_link_resources')
         if api_version == '2019-06-01':
@@ -859,6 +904,8 @@ def private_link_resources(self):
             from ..v2023_01_01.aio.operations import PrivateLinkResourcesOperations as OperationClass
         elif api_version == '2023-05-01':
             from ..v2023_05_01.aio.operations import PrivateLinkResourcesOperations as OperationClass
+        elif api_version == '2024-01-01':
+            from ..v2024_01_01.aio.operations import PrivateLinkResourcesOperations as OperationClass
         else:
             raise ValueError("API version {} does not have operation group 'private_link_resources'".format(api_version))
         self._config.api_version = api_version
@@ -880,6 +927,7 @@ def queue(self):
            * 2022-09-01: :class:`QueueOperations<azure.mgmt.storage.v2022_09_01.aio.operations.QueueOperations>`
            * 2023-01-01: :class:`QueueOperations<azure.mgmt.storage.v2023_01_01.aio.operations.QueueOperations>`
            * 2023-05-01: :class:`QueueOperations<azure.mgmt.storage.v2023_05_01.aio.operations.QueueOperations>`
+           * 2024-01-01: :class:`QueueOperations<azure.mgmt.storage.v2024_01_01.aio.operations.QueueOperations>`
         """
         api_version = self._get_api_version('queue')
         if api_version == '2019-06-01':
@@ -906,6 +954,8 @@ def queue(self):
             from ..v2023_01_01.aio.operations import QueueOperations as OperationClass
         elif api_version == '2023-05-01':
             from ..v2023_05_01.aio.operations import QueueOperations as OperationClass
+        elif api_version == '2024-01-01':
+            from ..v2024_01_01.aio.operations import QueueOperations as OperationClass
         else:
             raise ValueError("API version {} does not have operation group 'queue'".format(api_version))
         self._config.api_version = api_version
@@ -927,6 +977,7 @@ def queue_services(self):
            * 2022-09-01: :class:`QueueServicesOperations<azure.mgmt.storage.v2022_09_01.aio.operations.QueueServicesOperations>`
            * 2023-01-01: :class:`QueueServicesOperations<azure.mgmt.storage.v2023_01_01.aio.operations.QueueServicesOperations>`
            * 2023-05-01: :class:`QueueServicesOperations<azure.mgmt.storage.v2023_05_01.aio.operations.QueueServicesOperations>`
+           * 2024-01-01: :class:`QueueServicesOperations<azure.mgmt.storage.v2024_01_01.aio.operations.QueueServicesOperations>`
         """
         api_version = self._get_api_version('queue_services')
         if api_version == '2019-06-01':
@@ -953,6 +1004,8 @@ def queue_services(self):
             from ..v2023_01_01.aio.operations import QueueServicesOperations as OperationClass
         elif api_version == '2023-05-01':
             from ..v2023_05_01.aio.operations import QueueServicesOperations as OperationClass
+        elif api_version == '2024-01-01':
+            from ..v2024_01_01.aio.operations import QueueServicesOperations as OperationClass
         else:
             raise ValueError("API version {} does not have operation group 'queue_services'".format(api_version))
         self._config.api_version = api_version
@@ -981,6 +1034,7 @@ def skus(self):
            * 2022-09-01: :class:`SkusOperations<azure.mgmt.storage.v2022_09_01.aio.operations.SkusOperations>`
            * 2023-01-01: :class:`SkusOperations<azure.mgmt.storage.v2023_01_01.aio.operations.SkusOperations>`
            * 2023-05-01: :class:`SkusOperations<azure.mgmt.storage.v2023_05_01.aio.operations.SkusOperations>`
+           * 2024-01-01: :class:`SkusOperations<azure.mgmt.storage.v2024_01_01.aio.operations.SkusOperations>`
         """
         api_version = self._get_api_version('skus')
         if api_version == '2017-06-01':
@@ -1021,6 +1075,8 @@ def skus(self):
             from ..v2023_01_01.aio.operations import SkusOperations as OperationClass
         elif api_version == '2023-05-01':
             from ..v2023_05_01.aio.operations import SkusOperations as OperationClass
+        elif api_version == '2024-01-01':
+            from ..v2024_01_01.aio.operations import SkusOperations as OperationClass
         else:
             raise ValueError("API version {} does not have operation group 'skus'".format(api_version))
         self._config.api_version = api_version
@@ -1052,6 +1108,7 @@ def storage_accounts(self):
            * 2022-09-01: :class:`StorageAccountsOperations<azure.mgmt.storage.v2022_09_01.aio.operations.StorageAccountsOperations>`
            * 2023-01-01: :class:`StorageAccountsOperations<azure.mgmt.storage.v2023_01_01.aio.operations.StorageAccountsOperations>`
            * 2023-05-01: :class:`StorageAccountsOperations<azure.mgmt.storage.v2023_05_01.aio.operations.StorageAccountsOperations>`
+           * 2024-01-01: :class:`StorageAccountsOperations<azure.mgmt.storage.v2024_01_01.aio.operations.StorageAccountsOperations>`
         """
         api_version = self._get_api_version('storage_accounts')
         if api_version == '2015-06-15':
@@ -1098,6 +1155,8 @@ def storage_accounts(self):
             from ..v2023_01_01.aio.operations import StorageAccountsOperations as OperationClass
         elif api_version == '2023-05-01':
             from ..v2023_05_01.aio.operations import StorageAccountsOperations as OperationClass
+        elif api_version == '2024-01-01':
+            from ..v2024_01_01.aio.operations import StorageAccountsOperations as OperationClass
         else:
             raise ValueError("API version {} does not have operation group 'storage_accounts'".format(api_version))
         self._config.api_version = api_version
@@ -1108,10 +1167,13 @@ def storage_task_assignment_instances_report(self):
         """Instance depends on the API version:
 
            * 2023-05-01: :class:`StorageTaskAssignmentInstancesReportOperations<azure.mgmt.storage.v2023_05_01.aio.operations.StorageTaskAssignmentInstancesReportOperations>`
+           * 2024-01-01: :class:`StorageTaskAssignmentInstancesReportOperations<azure.mgmt.storage.v2024_01_01.aio.operations.StorageTaskAssignmentInstancesReportOperations>`
         """
         api_version = self._get_api_version('storage_task_assignment_instances_report')
         if api_version == '2023-05-01':
             from ..v2023_05_01.aio.operations import StorageTaskAssignmentInstancesReportOperations as OperationClass
+        elif api_version == '2024-01-01':
+            from ..v2024_01_01.aio.operations import StorageTaskAssignmentInstancesReportOperations as OperationClass
         else:
             raise ValueError("API version {} does not have operation group 'storage_task_assignment_instances_report'".format(api_version))
         self._config.api_version = api_version
@@ -1122,10 +1184,13 @@ def storage_task_assignments(self):
         """Instance depends on the API version:
 
            * 2023-05-01: :class:`StorageTaskAssignmentsOperations<azure.mgmt.storage.v2023_05_01.aio.operations.StorageTaskAssignmentsOperations>`
+           * 2024-01-01: :class:`StorageTaskAssignmentsOperations<azure.mgmt.storage.v2024_01_01.aio.operations.StorageTaskAssignmentsOperations>`
         """
         api_version = self._get_api_version('storage_task_assignments')
         if api_version == '2023-05-01':
             from ..v2023_05_01.aio.operations import StorageTaskAssignmentsOperations as OperationClass
+        elif api_version == '2024-01-01':
+            from ..v2024_01_01.aio.operations import StorageTaskAssignmentsOperations as OperationClass
         else:
             raise ValueError("API version {} does not have operation group 'storage_task_assignments'".format(api_version))
         self._config.api_version = api_version
@@ -1136,10 +1201,13 @@ def storage_task_assignments_instances_report(self):
         """Instance depends on the API version:
 
            * 2023-05-01: :class:`StorageTaskAssignmentsInstancesReportOperations<azure.mgmt.storage.v2023_05_01.aio.operations.StorageTaskAssignmentsInstancesReportOperations>`
+           * 2024-01-01: :class:`StorageTaskAssignmentsInstancesReportOperations<azure.mgmt.storage.v2024_01_01.aio.operations.StorageTaskAssignmentsInstancesReportOperations>`
         """
         api_version = self._get_api_version('storage_task_assignments_instances_report')
         if api_version == '2023-05-01':
             from ..v2023_05_01.aio.operations import StorageTaskAssignmentsInstancesReportOperations as OperationClass
+        elif api_version == '2024-01-01':
+            from ..v2024_01_01.aio.operations import StorageTaskAssignmentsInstancesReportOperations as OperationClass
         else:
             raise ValueError("API version {} does not have operation group 'storage_task_assignments_instances_report'".format(api_version))
         self._config.api_version = api_version
@@ -1161,6 +1229,7 @@ def table(self):
            * 2022-09-01: :class:`TableOperations<azure.mgmt.storage.v2022_09_01.aio.operations.TableOperations>`
            * 2023-01-01: :class:`TableOperations<azure.mgmt.storage.v2023_01_01.aio.operations.TableOperations>`
            * 2023-05-01: :class:`TableOperations<azure.mgmt.storage.v2023_05_01.aio.operations.TableOperations>`
+           * 2024-01-01: :class:`TableOperations<azure.mgmt.storage.v2024_01_01.aio.operations.TableOperations>`
         """
         api_version = self._get_api_version('table')
         if api_version == '2019-06-01':
@@ -1187,6 +1256,8 @@ def table(self):
             from ..v2023_01_01.aio.operations import TableOperations as OperationClass
         elif api_version == '2023-05-01':
             from ..v2023_05_01.aio.operations import TableOperations as OperationClass
+        elif api_version == '2024-01-01':
+            from ..v2024_01_01.aio.operations import TableOperations as OperationClass
         else:
             raise ValueError("API version {} does not have operation group 'table'".format(api_version))
         self._config.api_version = api_version
@@ -1208,6 +1279,7 @@ def table_services(self):
            * 2022-09-01: :class:`TableServicesOperations<azure.mgmt.storage.v2022_09_01.aio.operations.TableServicesOperations>`
            * 2023-01-01: :class:`TableServicesOperations<azure.mgmt.storage.v2023_01_01.aio.operations.TableServicesOperations>`
            * 2023-05-01: :class:`TableServicesOperations<azure.mgmt.storage.v2023_05_01.aio.operations.TableServicesOperations>`
+           * 2024-01-01: :class:`TableServicesOperations<azure.mgmt.storage.v2024_01_01.aio.operations.TableServicesOperations>`
         """
         api_version = self._get_api_version('table_services')
         if api_version == '2019-06-01':
@@ -1234,6 +1306,8 @@ def table_services(self):
             from ..v2023_01_01.aio.operations import TableServicesOperations as OperationClass
         elif api_version == '2023-05-01':
             from ..v2023_05_01.aio.operations import TableServicesOperations as OperationClass
+        elif api_version == '2024-01-01':
+            from ..v2024_01_01.aio.operations import TableServicesOperations as OperationClass
         else:
             raise ValueError("API version {} does not have operation group 'table_services'".format(api_version))
         self._config.api_version = api_version
@@ -1288,6 +1362,7 @@ def usages(self):
            * 2022-09-01: :class:`UsagesOperations<azure.mgmt.storage.v2022_09_01.aio.operations.UsagesOperations>`
            * 2023-01-01: :class:`UsagesOperations<azure.mgmt.storage.v2023_01_01.aio.operations.UsagesOperations>`
            * 2023-05-01: :class:`UsagesOperations<azure.mgmt.storage.v2023_05_01.aio.operations.UsagesOperations>`
+           * 2024-01-01: :class:`UsagesOperations<azure.mgmt.storage.v2024_01_01.aio.operations.UsagesOperations>`
         """
         api_version = self._get_api_version('usages')
         if api_version == '2018-03-01-preview':
@@ -1322,6 +1397,8 @@ def usages(self):
             from ..v2023_01_01.aio.operations import UsagesOperations as OperationClass
         elif api_version == '2023-05-01':
             from ..v2023_05_01.aio.operations import UsagesOperations as OperationClass
+        elif api_version == '2024-01-01':
+            from ..v2024_01_01.aio.operations import UsagesOperations as OperationClass
         else:
             raise ValueError("API version {} does not have operation group 'usages'".format(api_version))
         self._config.api_version = api_version
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/models.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/models.py
index 98fec195fcf7..0b2d93580b32 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/models.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/models.py
@@ -5,4 +5,4 @@
 # license information.
 # --------------------------------------------------------------------------
 from .v2018_02_01.models import *
-from .v2023_05_01.models import *
+from .v2024_01_01.models import *
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2015_06_15/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2015_06_15/__init__.py
index ebdc1d61615b..17522f0d6d17 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2015_06_15/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2015_06_15/__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 ._storage_management import StorageManagement
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._storage_management import StorageManagement  # 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__ = [
     "StorageManagement",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2015_06_15/_configuration.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2015_06_15/_configuration.py
index 09db0170b783..452938977130 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2015_06_15/_configuration.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2015_06_15/_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 StorageManagementConfiguration:  # pylint: disable=too-many-instance-attributes,name-too-long
+class StorageManagementConfiguration:  # pylint: disable=too-many-instance-attributes
     """Configuration for StorageManagement.
 
     Note that all parameters used to create this instance are saved as instance
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2015_06_15/_metadata.json b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2015_06_15/_metadata.json
index ba16009ace9d..a32a513f4641 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2015_06_15/_metadata.json
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2015_06_15/_metadata.json
@@ -10,8 +10,8 @@
         "azure_arm": true,
         "has_public_lro_operations": true,
         "client_side_validation": false,
-        "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"ARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementConfiguration\"], \".._serialization\": [\"Deserializer\", \"Serializer\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}}",
-        "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"AsyncARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"AsyncARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementConfiguration\"], \"..._serialization\": [\"Deserializer\", \"Serializer\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"]}}}"
+        "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"ARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementConfiguration\"], \".._serialization\": [\"Deserializer\", \"Serializer\"]}, \"stdlib\": {\"typing_extensions\": [\"Self\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}}",
+        "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"AsyncARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"AsyncARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementConfiguration\"], \"..._serialization\": [\"Deserializer\", \"Serializer\"]}, \"stdlib\": {\"typing_extensions\": [\"Self\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"]}}}"
     },
     "global_parameters": {
         "sync": {
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2015_06_15/_storage_management.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2015_06_15/_storage_management.py
index 777c2cd0a24f..98a4bc985533 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2015_06_15/_storage_management.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2015_06_15/_storage_management.py
@@ -8,6 +8,7 @@
 
 from copy import deepcopy
 from typing import Any, TYPE_CHECKING
+from typing_extensions import Self
 
 from azure.core.pipeline import policies
 from azure.core.rest import HttpRequest, HttpResponse
@@ -20,11 +21,10 @@
 from .operations import StorageAccountsOperations, UsageOperations
 
 if TYPE_CHECKING:
-    # pylint: disable=unused-import,ungrouped-imports
     from azure.core.credentials import TokenCredential
 
 
-class StorageManagement:  # pylint: disable=client-accepts-api-version-keyword
+class StorageManagement:
     """The Azure Storage Management API.
 
     :ivar storage_accounts: StorageAccountsOperations operations
@@ -107,7 +107,7 @@ def _send_request(self, request: HttpRequest, *, stream: bool = False, **kwargs:
     def close(self) -> None:
         self._client.close()
 
-    def __enter__(self) -> "StorageManagement":
+    def __enter__(self) -> Self:
         self._client.__enter__()
         return self
 
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2015_06_15/_version.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2015_06_15/_version.py
index 83bf7bbed684..e5754a47ce68 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2015_06_15/_version.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2015_06_15/_version.py
@@ -6,4 +6,4 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-VERSION = "21.2.1"
+VERSION = "1.0.0b1"
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2015_06_15/aio/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2015_06_15/aio/__init__.py
index 2ef22c4bc437..dcbae2659e8b 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2015_06_15/aio/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2015_06_15/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 ._storage_management import StorageManagement
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._storage_management import StorageManagement  # 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__ = [
     "StorageManagement",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2015_06_15/aio/_configuration.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2015_06_15/aio/_configuration.py
index 1b6493b10e64..a80ce99fbe18 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2015_06_15/aio/_configuration.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2015_06_15/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 StorageManagementConfiguration:  # pylint: disable=too-many-instance-attributes,name-too-long
+class StorageManagementConfiguration:  # pylint: disable=too-many-instance-attributes
     """Configuration for StorageManagement.
 
     Note that all parameters used to create this instance are saved as instance
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2015_06_15/aio/_storage_management.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2015_06_15/aio/_storage_management.py
index 826154c6ccd4..9cbcfa0a3ec6 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2015_06_15/aio/_storage_management.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2015_06_15/aio/_storage_management.py
@@ -8,6 +8,7 @@
 
 from copy import deepcopy
 from typing import Any, Awaitable, TYPE_CHECKING
+from typing_extensions import Self
 
 from azure.core.pipeline import policies
 from azure.core.rest import AsyncHttpResponse, HttpRequest
@@ -20,11 +21,10 @@
 from .operations import StorageAccountsOperations, UsageOperations
 
 if TYPE_CHECKING:
-    # pylint: disable=unused-import,ungrouped-imports
     from azure.core.credentials_async import AsyncTokenCredential
 
 
-class StorageManagement:  # pylint: disable=client-accepts-api-version-keyword
+class StorageManagement:
     """The Azure Storage Management API.
 
     :ivar storage_accounts: StorageAccountsOperations operations
@@ -110,7 +110,7 @@ def _send_request(
     async def close(self) -> None:
         await self._client.close()
 
-    async def __aenter__(self) -> "StorageManagement":
+    async def __aenter__(self) -> Self:
         await self._client.__aenter__()
         return self
 
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2015_06_15/aio/operations/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2015_06_15/aio/operations/__init__.py
index 6f4f0606778e..442238573341 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2015_06_15/aio/operations/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2015_06_15/aio/operations/__init__.py
@@ -5,17 +5,23 @@
 # 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 ._storage_accounts_operations import StorageAccountsOperations
-from ._usage_operations import UsageOperations
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._storage_accounts_operations import StorageAccountsOperations  # type: ignore
+from ._usage_operations import UsageOperations  # 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__ = [
     "StorageAccountsOperations",
     "UsageOperations",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2015_06_15/aio/operations/_storage_accounts_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2015_06_15/aio/operations/_storage_accounts_operations.py
index ba7e3fe72204..dfbdec337e21 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2015_06_15/aio/operations/_storage_accounts_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2015_06_15/aio/operations/_storage_accounts_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,7 @@
 # --------------------------------------------------------------------------
 from io import IOBase
 import sys
-from typing import Any, AsyncIterable, 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
@@ -18,12 +18,13 @@
     ResourceExistsError,
     ResourceNotFoundError,
     ResourceNotModifiedError,
+    StreamClosedError,
+    StreamConsumedError,
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
 from azure.core.polling import AsyncLROPoller, AsyncNoPolling, AsyncPollingMethod
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
@@ -31,7 +32,6 @@
 from azure.mgmt.core.polling.async_arm_polling import AsyncARMPolling
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._storage_accounts_operations import (
     build_check_name_availability_request,
     build_create_request,
@@ -47,7 +47,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]]
 
@@ -130,7 +130,7 @@ async def check_name_availability(
         :rtype: ~azure.mgmt.storage.v2015_06_15.models.CheckNameAvailabilityResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -162,7 +162,6 @@ async def check_name_availability(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -176,7 +175,7 @@ async def check_name_availability(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response)
+        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -189,8 +188,8 @@ async def _create_initial(
         account_name: str,
         parameters: Union[_models.StorageAccountCreateParameters, IO[bytes]],
         **kwargs: Any
-    ) -> Optional[_models.StorageAccount]:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -203,7 +202,7 @@ async def _create_initial(
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2015-06-15"))
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
-        cls: ClsType[Optional[_models.StorageAccount]] = kwargs.pop("cls", None)
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
         _json = None
@@ -224,10 +223,10 @@ async def _create_initial(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -235,12 +234,14 @@ async def _create_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = None
-        if response.status_code == 200:
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -366,10 +367,11 @@ async def begin_create(
                 params=_params,
                 **kwargs
             )
+            await raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+            deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
             if cls:
                 return cls(pipeline_response, deserialized, {})  # type: ignore
             return deserialized
@@ -392,9 +394,7 @@ def get_long_running_output(pipeline_response):
         )
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, **kwargs: Any
-    ) -> None:
+    async def delete(self, resource_group_name: str, account_name: str, **kwargs: Any) -> None:
         """Deletes a storage account in Microsoft Azure.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -408,7 +408,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,
@@ -430,7 +430,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -466,7 +465,7 @@ async def get_properties(
         :rtype: ~azure.mgmt.storage.v2015_06_15.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -488,7 +487,6 @@ async def get_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -502,7 +500,7 @@ async def get_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -613,7 +611,7 @@ async def update(
         :rtype: ~azure.mgmt.storage.v2015_06_15.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -647,7 +645,6 @@ async def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -661,7 +658,7 @@ async def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -684,7 +681,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.StorageAccount"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2015-06-15"))
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -701,7 +698,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -717,7 +713,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -767,7 +762,7 @@ def list_by_resource_group(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2015-06-15"))
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -785,7 +780,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -801,7 +795,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -845,7 +838,7 @@ async def list_keys(self, resource_group_name: str, account_name: str, **kwargs:
         :rtype: ~azure.mgmt.storage.v2015_06_15.models.StorageAccountKeys
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -867,7 +860,6 @@ async def list_keys(self, resource_group_name: str, account_name: str, **kwargs:
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -881,7 +873,7 @@ async def list_keys(self, resource_group_name: str, account_name: str, **kwargs:
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountKeys", pipeline_response)
+        deserialized = self._deserialize("StorageAccountKeys", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -974,7 +966,7 @@ async def regenerate_key(
         :rtype: ~azure.mgmt.storage.v2015_06_15.models.StorageAccountKeys
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1008,7 +1000,6 @@ async def regenerate_key(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1022,7 +1013,7 @@ async def regenerate_key(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountKeys", pipeline_response)
+        deserialized = self._deserialize("StorageAccountKeys", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2015_06_15/aio/operations/_usage_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2015_06_15/aio/operations/_usage_operations.py
index 832adc843ace..679e435ffbff 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2015_06_15/aio/operations/_usage_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2015_06_15/aio/operations/_usage_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
@@ -20,20 +19,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._usage_operations import build_list_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
 
@@ -72,7 +69,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.Usage"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2015-06-15"))
         cls: ClsType[_models.UsageListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -89,7 +86,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -105,7 +101,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2015_06_15/models/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2015_06_15/models/__init__.py
index 159ef4af78dd..bc252b8e2d01 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2015_06_15/models/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2015_06_15/models/__init__.py
@@ -5,29 +5,40 @@
 # 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 CheckNameAvailabilityResult
-from ._models_py3 import CustomDomain
-from ._models_py3 import Endpoints
-from ._models_py3 import Resource
-from ._models_py3 import StorageAccount
-from ._models_py3 import StorageAccountCheckNameAvailabilityParameters
-from ._models_py3 import StorageAccountCreateParameters
-from ._models_py3 import StorageAccountKeys
-from ._models_py3 import StorageAccountListResult
-from ._models_py3 import StorageAccountRegenerateKeyParameters
-from ._models_py3 import StorageAccountUpdateParameters
-from ._models_py3 import Usage
-from ._models_py3 import UsageListResult
-from ._models_py3 import UsageName
+from typing import TYPE_CHECKING
 
-from ._storage_management_enums import AccountStatus
-from ._storage_management_enums import AccountType
-from ._storage_management_enums import ProvisioningState
-from ._storage_management_enums import Reason
-from ._storage_management_enums import UsageUnit
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+
+from ._models_py3 import (  # type: ignore
+    CheckNameAvailabilityResult,
+    CustomDomain,
+    Endpoints,
+    Resource,
+    StorageAccount,
+    StorageAccountCheckNameAvailabilityParameters,
+    StorageAccountCreateParameters,
+    StorageAccountKeys,
+    StorageAccountListResult,
+    StorageAccountRegenerateKeyParameters,
+    StorageAccountUpdateParameters,
+    Usage,
+    UsageListResult,
+    UsageName,
+)
+
+from ._storage_management_enums import (  # type: ignore
+    AccountStatus,
+    AccountType,
+    ProvisioningState,
+    Reason,
+    UsageUnit,
+)
 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__ = [
@@ -51,5 +62,5 @@
     "Reason",
     "UsageUnit",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2015_06_15/models/_models_py3.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2015_06_15/models/_models_py3.py
index c7c3218ea125..fd4652e5e97e 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2015_06_15/models/_models_py3.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2015_06_15/models/_models_py3.py
@@ -1,5 +1,4 @@
 # coding=utf-8
-# pylint: disable=too-many-lines
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License. See License.txt in the project root for license information.
@@ -13,7 +12,6 @@
 from ... import _serialization
 
 if TYPE_CHECKING:
-    # pylint: disable=unused-import,ungrouped-imports
     from .. import models as _models
 
 
@@ -190,7 +188,7 @@ def __init__(self, *, location: Optional[str] = None, tags: Optional[Dict[str, s
         self.tags = tags
 
 
-class StorageAccount(Resource):  # pylint: disable=too-many-instance-attributes
+class StorageAccount(Resource):
     """The storage account.
 
     Variables are only populated by the server, and will be ignored when sending a request.
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2015_06_15/operations/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2015_06_15/operations/__init__.py
index 6f4f0606778e..442238573341 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2015_06_15/operations/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2015_06_15/operations/__init__.py
@@ -5,17 +5,23 @@
 # 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 ._storage_accounts_operations import StorageAccountsOperations
-from ._usage_operations import UsageOperations
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._storage_accounts_operations import StorageAccountsOperations  # type: ignore
+from ._usage_operations import UsageOperations  # 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__ = [
     "StorageAccountsOperations",
     "UsageOperations",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2015_06_15/operations/_storage_accounts_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2015_06_15/operations/_storage_accounts_operations.py
index ed828ac2a2f9..5838fc807bdb 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2015_06_15/operations/_storage_accounts_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2015_06_15/operations/_storage_accounts_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,7 @@
 # --------------------------------------------------------------------------
 from io import IOBase
 import sys
-from typing import Any, Callable, Dict, IO, Iterable, 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 (
@@ -17,13 +17,14 @@
     ResourceExistsError,
     ResourceNotFoundError,
     ResourceNotModifiedError,
+    StreamClosedError,
+    StreamConsumedError,
     map_error,
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
 from azure.core.polling import LROPoller, NoPolling, PollingMethod
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
@@ -31,12 +32,11 @@
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -406,7 +406,7 @@ def check_name_availability(
         :rtype: ~azure.mgmt.storage.v2015_06_15.models.CheckNameAvailabilityResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -438,7 +438,6 @@ def check_name_availability(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -452,7 +451,7 @@ def check_name_availability(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response)
+        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -465,8 +464,8 @@ def _create_initial(
         account_name: str,
         parameters: Union[_models.StorageAccountCreateParameters, IO[bytes]],
         **kwargs: Any
-    ) -> Optional[_models.StorageAccount]:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> Iterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -479,7 +478,7 @@ def _create_initial(
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2015-06-15"))
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
-        cls: ClsType[Optional[_models.StorageAccount]] = kwargs.pop("cls", None)
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
         _json = None
@@ -500,10 +499,10 @@ def _create_initial(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -511,12 +510,14 @@ def _create_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = None
-        if response.status_code == 200:
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -639,10 +640,11 @@ def begin_create(
                 params=_params,
                 **kwargs
             )
+            raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+            deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
             if cls:
                 return cls(pipeline_response, deserialized, {})  # type: ignore
             return deserialized
@@ -681,7 +683,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,
@@ -703,7 +705,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -737,7 +738,7 @@ def get_properties(self, resource_group_name: str, account_name: str, **kwargs:
         :rtype: ~azure.mgmt.storage.v2015_06_15.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -759,7 +760,6 @@ def get_properties(self, resource_group_name: str, account_name: str, **kwargs:
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -773,7 +773,7 @@ def get_properties(self, resource_group_name: str, account_name: str, **kwargs:
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -884,7 +884,7 @@ def update(
         :rtype: ~azure.mgmt.storage.v2015_06_15.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -918,7 +918,6 @@ def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -932,7 +931,7 @@ def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -954,7 +953,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.StorageAccount"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2015-06-15"))
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -971,7 +970,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -987,7 +985,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -1034,7 +1031,7 @@ def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> Ite
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2015-06-15"))
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1052,7 +1049,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -1068,7 +1064,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -1112,7 +1107,7 @@ def list_keys(self, resource_group_name: str, account_name: str, **kwargs: Any)
         :rtype: ~azure.mgmt.storage.v2015_06_15.models.StorageAccountKeys
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1134,7 +1129,6 @@ def list_keys(self, resource_group_name: str, account_name: str, **kwargs: Any)
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1148,7 +1142,7 @@ def list_keys(self, resource_group_name: str, account_name: str, **kwargs: Any)
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountKeys", pipeline_response)
+        deserialized = self._deserialize("StorageAccountKeys", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1241,7 +1235,7 @@ def regenerate_key(
         :rtype: ~azure.mgmt.storage.v2015_06_15.models.StorageAccountKeys
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1275,7 +1269,6 @@ def regenerate_key(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1289,7 +1282,7 @@ def regenerate_key(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountKeys", pipeline_response)
+        deserialized = self._deserialize("StorageAccountKeys", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2015_06_15/operations/_usage_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2015_06_15/operations/_usage_operations.py
index 6dd8e11adf0a..1526f6da3314 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2015_06_15/operations/_usage_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2015_06_15/operations/_usage_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 (
@@ -20,20 +19,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -99,7 +96,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.Usage"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2015-06-15"))
         cls: ClsType[_models.UsageListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -116,7 +113,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -132,7 +128,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_01_01/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_01_01/__init__.py
index a860a5c185c9..60980065e1ee 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_01_01/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_01_01/__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 ._storage_management_client import StorageManagementClient
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._storage_management_client import StorageManagementClient  # 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__ = [
     "StorageManagementClient",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_01_01/_configuration.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_01_01/_configuration.py
index 0311eb048776..50329ece5044 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_01_01/_configuration.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_01_01/_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 StorageManagementClientConfiguration:  # pylint: disable=too-many-instance-attributes,name-too-long
+class StorageManagementClientConfiguration:  # pylint: disable=too-many-instance-attributes
     """Configuration for StorageManagementClient.
 
     Note that all parameters used to create this instance are saved as instance
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_01_01/_metadata.json b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_01_01/_metadata.json
index b49e8562233a..27251b7fd70f 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_01_01/_metadata.json
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_01_01/_metadata.json
@@ -10,8 +10,8 @@
         "azure_arm": true,
         "has_public_lro_operations": true,
         "client_side_validation": false,
-        "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"ARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementClientConfiguration\"], \".._serialization\": [\"Deserializer\", \"Serializer\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}}",
-        "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"AsyncARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"AsyncARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementClientConfiguration\"], \"..._serialization\": [\"Deserializer\", \"Serializer\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"]}}}"
+        "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"ARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementClientConfiguration\"], \".._serialization\": [\"Deserializer\", \"Serializer\"]}, \"stdlib\": {\"typing_extensions\": [\"Self\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}}",
+        "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"AsyncARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"AsyncARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementClientConfiguration\"], \"..._serialization\": [\"Deserializer\", \"Serializer\"]}, \"stdlib\": {\"typing_extensions\": [\"Self\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"]}}}"
     },
     "global_parameters": {
         "sync": {
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_01_01/_storage_management_client.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_01_01/_storage_management_client.py
index 57ba78f99452..6f761c96da98 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_01_01/_storage_management_client.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_01_01/_storage_management_client.py
@@ -8,6 +8,7 @@
 
 from copy import deepcopy
 from typing import Any, TYPE_CHECKING
+from typing_extensions import Self
 
 from azure.core.pipeline import policies
 from azure.core.rest import HttpRequest, HttpResponse
@@ -20,11 +21,10 @@
 from .operations import StorageAccountsOperations, UsageOperations
 
 if TYPE_CHECKING:
-    # pylint: disable=unused-import,ungrouped-imports
     from azure.core.credentials import TokenCredential
 
 
-class StorageManagementClient:  # pylint: disable=client-accepts-api-version-keyword
+class StorageManagementClient:
     """The Storage Management Client.
 
     :ivar storage_accounts: StorageAccountsOperations operations
@@ -109,7 +109,7 @@ def _send_request(self, request: HttpRequest, *, stream: bool = False, **kwargs:
     def close(self) -> None:
         self._client.close()
 
-    def __enter__(self) -> "StorageManagementClient":
+    def __enter__(self) -> Self:
         self._client.__enter__()
         return self
 
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_01_01/_vendor.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_01_01/_vendor.py
deleted file mode 100644
index 0dafe0e287ff..000000000000
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_01_01/_vendor.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# --------------------------------------------------------------------------
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License. See License.txt in the project root for license information.
-# Code generated by Microsoft (R) AutoRest Code Generator.
-# Changes may cause incorrect behavior and will be lost if the code is regenerated.
-# --------------------------------------------------------------------------
-
-from azure.core.pipeline.transport import HttpRequest
-
-
-def _convert_request(request, files=None):
-    data = request.content if not files else None
-    request = HttpRequest(method=request.method, url=request.url, headers=request.headers, data=data)
-    if files:
-        request.set_formdata_body(files)
-    return request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_01_01/_version.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_01_01/_version.py
index 83bf7bbed684..e5754a47ce68 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_01_01/_version.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_01_01/_version.py
@@ -6,4 +6,4 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-VERSION = "21.2.1"
+VERSION = "1.0.0b1"
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_01_01/aio/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_01_01/aio/__init__.py
index a5c3d2414cfd..ee2b940bd4fc 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_01_01/aio/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_01_01/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 ._storage_management_client import StorageManagementClient
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._storage_management_client import StorageManagementClient  # 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__ = [
     "StorageManagementClient",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_01_01/aio/_configuration.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_01_01/aio/_configuration.py
index c855fa5f21b5..909aa6433e78 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_01_01/aio/_configuration.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_01_01/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 StorageManagementClientConfiguration:  # pylint: disable=too-many-instance-attributes,name-too-long
+class StorageManagementClientConfiguration:  # pylint: disable=too-many-instance-attributes
     """Configuration for StorageManagementClient.
 
     Note that all parameters used to create this instance are saved as instance
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_01_01/aio/_storage_management_client.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_01_01/aio/_storage_management_client.py
index e01f6ceeb104..d5839e7a1215 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_01_01/aio/_storage_management_client.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_01_01/aio/_storage_management_client.py
@@ -8,6 +8,7 @@
 
 from copy import deepcopy
 from typing import Any, Awaitable, TYPE_CHECKING
+from typing_extensions import Self
 
 from azure.core.pipeline import policies
 from azure.core.rest import AsyncHttpResponse, HttpRequest
@@ -20,11 +21,10 @@
 from .operations import StorageAccountsOperations, UsageOperations
 
 if TYPE_CHECKING:
-    # pylint: disable=unused-import,ungrouped-imports
     from azure.core.credentials_async import AsyncTokenCredential
 
 
-class StorageManagementClient:  # pylint: disable=client-accepts-api-version-keyword
+class StorageManagementClient:
     """The Storage Management Client.
 
     :ivar storage_accounts: StorageAccountsOperations operations
@@ -112,7 +112,7 @@ def _send_request(
     async def close(self) -> None:
         await self._client.close()
 
-    async def __aenter__(self) -> "StorageManagementClient":
+    async def __aenter__(self) -> Self:
         await self._client.__aenter__()
         return self
 
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_01_01/aio/operations/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_01_01/aio/operations/__init__.py
index 6f4f0606778e..442238573341 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_01_01/aio/operations/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_01_01/aio/operations/__init__.py
@@ -5,17 +5,23 @@
 # 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 ._storage_accounts_operations import StorageAccountsOperations
-from ._usage_operations import UsageOperations
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._storage_accounts_operations import StorageAccountsOperations  # type: ignore
+from ._usage_operations import UsageOperations  # 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__ = [
     "StorageAccountsOperations",
     "UsageOperations",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_01_01/aio/operations/_storage_accounts_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_01_01/aio/operations/_storage_accounts_operations.py
index d48b50887736..d418aca7287c 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_01_01/aio/operations/_storage_accounts_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_01_01/aio/operations/_storage_accounts_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,7 @@
 # --------------------------------------------------------------------------
 from io import IOBase
 import sys
-from typing import Any, AsyncIterable, 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
@@ -18,12 +18,13 @@
     ResourceExistsError,
     ResourceNotFoundError,
     ResourceNotModifiedError,
+    StreamClosedError,
+    StreamConsumedError,
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
 from azure.core.polling import AsyncLROPoller, AsyncNoPolling, AsyncPollingMethod
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
@@ -31,7 +32,6 @@
 from azure.mgmt.core.polling.async_arm_polling import AsyncARMPolling
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._storage_accounts_operations import (
     build_check_name_availability_request,
     build_create_request,
@@ -47,7 +47,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]]
 
@@ -130,7 +130,7 @@ async def check_name_availability(
         :rtype: ~azure.mgmt.storage.v2016_01_01.models.CheckNameAvailabilityResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -162,7 +162,6 @@ async def check_name_availability(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -176,7 +175,7 @@ async def check_name_availability(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response)
+        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -189,8 +188,8 @@ async def _create_initial(
         account_name: str,
         parameters: Union[_models.StorageAccountCreateParameters, IO[bytes]],
         **kwargs: Any
-    ) -> Optional[_models.StorageAccount]:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -203,7 +202,7 @@ async def _create_initial(
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2016-01-01"))
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
-        cls: ClsType[Optional[_models.StorageAccount]] = kwargs.pop("cls", None)
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
         _json = None
@@ -224,10 +223,10 @@ async def _create_initial(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -235,12 +234,14 @@ async def _create_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = None
-        if response.status_code == 200:
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -366,10 +367,11 @@ async def begin_create(
                 params=_params,
                 **kwargs
             )
+            await raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+            deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
             if cls:
                 return cls(pipeline_response, deserialized, {})  # type: ignore
             return deserialized
@@ -392,9 +394,7 @@ def get_long_running_output(pipeline_response):
         )
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, **kwargs: Any
-    ) -> None:
+    async def delete(self, resource_group_name: str, account_name: str, **kwargs: Any) -> None:
         """Deletes a storage account in Microsoft Azure.
 
         :param resource_group_name: The name of the resource group within the user's subscription.
@@ -408,7 +408,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,
@@ -430,7 +430,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -466,7 +465,7 @@ async def get_properties(
         :rtype: ~azure.mgmt.storage.v2016_01_01.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -488,7 +487,6 @@ async def get_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -502,7 +500,7 @@ async def get_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -613,7 +611,7 @@ async def update(
         :rtype: ~azure.mgmt.storage.v2016_01_01.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -647,7 +645,6 @@ async def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -661,7 +658,7 @@ async def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -684,7 +681,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.StorageAccount"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2016-01-01"))
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -701,7 +698,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -717,7 +713,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -767,7 +762,7 @@ def list_by_resource_group(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2016-01-01"))
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -785,7 +780,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -801,7 +795,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -847,7 +840,7 @@ async def list_keys(
         :rtype: ~azure.mgmt.storage.v2016_01_01.models.StorageAccountListKeysResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -869,7 +862,6 @@ async def list_keys(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -883,7 +875,7 @@ async def list_keys(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response)
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -976,7 +968,7 @@ async def regenerate_key(
         :rtype: ~azure.mgmt.storage.v2016_01_01.models.StorageAccountListKeysResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1010,7 +1002,6 @@ async def regenerate_key(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1024,7 +1015,7 @@ async def regenerate_key(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response)
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_01_01/aio/operations/_usage_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_01_01/aio/operations/_usage_operations.py
index 9c5b1fd952bb..5b50a0730980 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_01_01/aio/operations/_usage_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_01_01/aio/operations/_usage_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
@@ -20,20 +19,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._usage_operations import build_list_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
 
@@ -72,7 +69,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.Usage"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2016-01-01"))
         cls: ClsType[_models.UsageListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -89,7 +86,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -105,7 +101,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_01_01/models/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_01_01/models/__init__.py
index c653cb309885..932acd6335bb 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_01_01/models/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_01_01/models/__init__.py
@@ -5,40 +5,51 @@
 # 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 CheckNameAvailabilityResult
-from ._models_py3 import CustomDomain
-from ._models_py3 import Encryption
-from ._models_py3 import EncryptionService
-from ._models_py3 import EncryptionServices
-from ._models_py3 import Endpoints
-from ._models_py3 import Resource
-from ._models_py3 import Sku
-from ._models_py3 import StorageAccount
-from ._models_py3 import StorageAccountCheckNameAvailabilityParameters
-from ._models_py3 import StorageAccountCreateParameters
-from ._models_py3 import StorageAccountKey
-from ._models_py3 import StorageAccountListKeysResult
-from ._models_py3 import StorageAccountListResult
-from ._models_py3 import StorageAccountRegenerateKeyParameters
-from ._models_py3 import StorageAccountUpdateParameters
-from ._models_py3 import Usage
-from ._models_py3 import UsageListResult
-from ._models_py3 import UsageName
+from typing import TYPE_CHECKING
 
-from ._storage_management_client_enums import AccessTier
-from ._storage_management_client_enums import AccountStatus
-from ._storage_management_client_enums import EncryptionKeySource
-from ._storage_management_client_enums import KeyPermission
-from ._storage_management_client_enums import Kind
-from ._storage_management_client_enums import ProvisioningState
-from ._storage_management_client_enums import Reason
-from ._storage_management_client_enums import SkuName
-from ._storage_management_client_enums import SkuTier
-from ._storage_management_client_enums import StorageAccountCheckNameAvailabilityParametersType
-from ._storage_management_client_enums import UsageUnit
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+
+from ._models_py3 import (  # type: ignore
+    CheckNameAvailabilityResult,
+    CustomDomain,
+    Encryption,
+    EncryptionService,
+    EncryptionServices,
+    Endpoints,
+    Resource,
+    Sku,
+    StorageAccount,
+    StorageAccountCheckNameAvailabilityParameters,
+    StorageAccountCreateParameters,
+    StorageAccountKey,
+    StorageAccountListKeysResult,
+    StorageAccountListResult,
+    StorageAccountRegenerateKeyParameters,
+    StorageAccountUpdateParameters,
+    Usage,
+    UsageListResult,
+    UsageName,
+)
+
+from ._storage_management_client_enums import (  # type: ignore
+    AccessTier,
+    AccountStatus,
+    EncryptionKeySource,
+    KeyPermission,
+    Kind,
+    ProvisioningState,
+    Reason,
+    SkuName,
+    SkuTier,
+    StorageAccountCheckNameAvailabilityParametersType,
+    UsageUnit,
+)
 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__ = [
@@ -73,5 +84,5 @@
     "StorageAccountCheckNameAvailabilityParametersType",
     "UsageUnit",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_01_01/models/_models_py3.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_01_01/models/_models_py3.py
index 3267ab956a8c..9fdf73c6989c 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_01_01/models/_models_py3.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_01_01/models/_models_py3.py
@@ -1,5 +1,4 @@
 # coding=utf-8
-# pylint: disable=too-many-lines
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License. See License.txt in the project root for license information.
@@ -12,7 +11,6 @@
 from ... import _serialization
 
 if TYPE_CHECKING:
-    # pylint: disable=unused-import,ungrouped-imports
     from .. import models as _models
 
 
@@ -307,7 +305,7 @@ def __init__(self, *, name: Union[str, "_models.SkuName"], **kwargs: Any) -> Non
         self.tier = None
 
 
-class StorageAccount(Resource):  # pylint: disable=too-many-instance-attributes
+class StorageAccount(Resource):
     """The storage account.
 
     Variables are only populated by the server, and will be ignored when sending a request.
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_01_01/operations/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_01_01/operations/__init__.py
index 6f4f0606778e..442238573341 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_01_01/operations/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_01_01/operations/__init__.py
@@ -5,17 +5,23 @@
 # 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 ._storage_accounts_operations import StorageAccountsOperations
-from ._usage_operations import UsageOperations
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._storage_accounts_operations import StorageAccountsOperations  # type: ignore
+from ._usage_operations import UsageOperations  # 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__ = [
     "StorageAccountsOperations",
     "UsageOperations",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_01_01/operations/_storage_accounts_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_01_01/operations/_storage_accounts_operations.py
index fff2005955c9..3b5dad644276 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_01_01/operations/_storage_accounts_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_01_01/operations/_storage_accounts_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,7 @@
 # --------------------------------------------------------------------------
 from io import IOBase
 import sys
-from typing import Any, Callable, Dict, IO, Iterable, 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 (
@@ -17,13 +17,14 @@
     ResourceExistsError,
     ResourceNotFoundError,
     ResourceNotModifiedError,
+    StreamClosedError,
+    StreamConsumedError,
     map_error,
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
 from azure.core.polling import LROPoller, NoPolling, PollingMethod
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
@@ -31,12 +32,11 @@
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -392,7 +392,7 @@ def check_name_availability(
         :rtype: ~azure.mgmt.storage.v2016_01_01.models.CheckNameAvailabilityResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -424,7 +424,6 @@ def check_name_availability(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -438,7 +437,7 @@ def check_name_availability(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response)
+        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -451,8 +450,8 @@ def _create_initial(
         account_name: str,
         parameters: Union[_models.StorageAccountCreateParameters, IO[bytes]],
         **kwargs: Any
-    ) -> Optional[_models.StorageAccount]:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> Iterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -465,7 +464,7 @@ def _create_initial(
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2016-01-01"))
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
-        cls: ClsType[Optional[_models.StorageAccount]] = kwargs.pop("cls", None)
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
         _json = None
@@ -486,10 +485,10 @@ def _create_initial(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -497,12 +496,14 @@ def _create_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = None
-        if response.status_code == 200:
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -625,10 +626,11 @@ def begin_create(
                 params=_params,
                 **kwargs
             )
+            raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+            deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
             if cls:
                 return cls(pipeline_response, deserialized, {})  # type: ignore
             return deserialized
@@ -667,7 +669,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,
@@ -689,7 +691,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -723,7 +724,7 @@ def get_properties(self, resource_group_name: str, account_name: str, **kwargs:
         :rtype: ~azure.mgmt.storage.v2016_01_01.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -745,7 +746,6 @@ def get_properties(self, resource_group_name: str, account_name: str, **kwargs:
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -759,7 +759,7 @@ def get_properties(self, resource_group_name: str, account_name: str, **kwargs:
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -870,7 +870,7 @@ def update(
         :rtype: ~azure.mgmt.storage.v2016_01_01.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -904,7 +904,6 @@ def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -918,7 +917,7 @@ def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -940,7 +939,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.StorageAccount"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2016-01-01"))
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -957,7 +956,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -973,7 +971,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -1020,7 +1017,7 @@ def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> Ite
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2016-01-01"))
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1038,7 +1035,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -1054,7 +1050,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -1100,7 +1095,7 @@ def list_keys(
         :rtype: ~azure.mgmt.storage.v2016_01_01.models.StorageAccountListKeysResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1122,7 +1117,6 @@ def list_keys(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1136,7 +1130,7 @@ def list_keys(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response)
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1229,7 +1223,7 @@ def regenerate_key(
         :rtype: ~azure.mgmt.storage.v2016_01_01.models.StorageAccountListKeysResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1263,7 +1257,6 @@ def regenerate_key(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1277,7 +1270,7 @@ def regenerate_key(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response)
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_01_01/operations/_usage_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_01_01/operations/_usage_operations.py
index 54c5a4026a5e..b1e72929ef93 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_01_01/operations/_usage_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_01_01/operations/_usage_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 (
@@ -20,20 +19,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -99,7 +96,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.Usage"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2016-01-01"))
         cls: ClsType[_models.UsageListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -116,7 +113,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -132,7 +128,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_12_01/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_12_01/__init__.py
index ebdc1d61615b..17522f0d6d17 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_12_01/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_12_01/__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 ._storage_management import StorageManagement
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._storage_management import StorageManagement  # 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__ = [
     "StorageManagement",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_12_01/_configuration.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_12_01/_configuration.py
index 3039798df557..7dbcae8cdece 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_12_01/_configuration.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_12_01/_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 StorageManagementConfiguration:  # pylint: disable=too-many-instance-attributes,name-too-long
+class StorageManagementConfiguration:  # pylint: disable=too-many-instance-attributes
     """Configuration for StorageManagement.
 
     Note that all parameters used to create this instance are saved as instance
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_12_01/_metadata.json b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_12_01/_metadata.json
index 8f1101556fc6..7b311c5dcf6a 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_12_01/_metadata.json
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_12_01/_metadata.json
@@ -10,8 +10,8 @@
         "azure_arm": true,
         "has_public_lro_operations": true,
         "client_side_validation": false,
-        "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"ARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementConfiguration\"], \".._serialization\": [\"Deserializer\", \"Serializer\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}}",
-        "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"AsyncARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"AsyncARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementConfiguration\"], \"..._serialization\": [\"Deserializer\", \"Serializer\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"]}}}"
+        "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"ARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementConfiguration\"], \".._serialization\": [\"Deserializer\", \"Serializer\"]}, \"stdlib\": {\"typing_extensions\": [\"Self\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}}",
+        "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"AsyncARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"AsyncARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementConfiguration\"], \"..._serialization\": [\"Deserializer\", \"Serializer\"]}, \"stdlib\": {\"typing_extensions\": [\"Self\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"]}}}"
     },
     "global_parameters": {
         "sync": {
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_12_01/_storage_management.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_12_01/_storage_management.py
index 769d635425fc..1b1448b80f02 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_12_01/_storage_management.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_12_01/_storage_management.py
@@ -8,6 +8,7 @@
 
 from copy import deepcopy
 from typing import Any, TYPE_CHECKING
+from typing_extensions import Self
 
 from azure.core.pipeline import policies
 from azure.core.rest import HttpRequest, HttpResponse
@@ -20,11 +21,10 @@
 from .operations import StorageAccountsOperations, UsageOperations
 
 if TYPE_CHECKING:
-    # pylint: disable=unused-import,ungrouped-imports
     from azure.core.credentials import TokenCredential
 
 
-class StorageManagement:  # pylint: disable=client-accepts-api-version-keyword
+class StorageManagement:
     """The Azure Storage Management API.
 
     :ivar storage_accounts: StorageAccountsOperations operations
@@ -107,7 +107,7 @@ def _send_request(self, request: HttpRequest, *, stream: bool = False, **kwargs:
     def close(self) -> None:
         self._client.close()
 
-    def __enter__(self) -> "StorageManagement":
+    def __enter__(self) -> Self:
         self._client.__enter__()
         return self
 
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_12_01/_vendor.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_12_01/_vendor.py
deleted file mode 100644
index 0dafe0e287ff..000000000000
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_12_01/_vendor.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# --------------------------------------------------------------------------
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License. See License.txt in the project root for license information.
-# Code generated by Microsoft (R) AutoRest Code Generator.
-# Changes may cause incorrect behavior and will be lost if the code is regenerated.
-# --------------------------------------------------------------------------
-
-from azure.core.pipeline.transport import HttpRequest
-
-
-def _convert_request(request, files=None):
-    data = request.content if not files else None
-    request = HttpRequest(method=request.method, url=request.url, headers=request.headers, data=data)
-    if files:
-        request.set_formdata_body(files)
-    return request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_12_01/_version.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_12_01/_version.py
index 5a163c0afedc..e5754a47ce68 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_12_01/_version.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_12_01/_version.py
@@ -6,4 +6,4 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-VERSION = "21.2.1"
\ No newline at end of file
+VERSION = "1.0.0b1"
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_12_01/aio/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_12_01/aio/__init__.py
index 2ef22c4bc437..dcbae2659e8b 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_12_01/aio/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_12_01/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 ._storage_management import StorageManagement
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._storage_management import StorageManagement  # 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__ = [
     "StorageManagement",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_12_01/aio/_configuration.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_12_01/aio/_configuration.py
index 2aca0751aec4..f85b203a4f28 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_12_01/aio/_configuration.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_12_01/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 StorageManagementConfiguration:  # pylint: disable=too-many-instance-attributes,name-too-long
+class StorageManagementConfiguration:  # pylint: disable=too-many-instance-attributes
     """Configuration for StorageManagement.
 
     Note that all parameters used to create this instance are saved as instance
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_12_01/aio/_storage_management.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_12_01/aio/_storage_management.py
index 644c89ba9a94..c82fb493de65 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_12_01/aio/_storage_management.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_12_01/aio/_storage_management.py
@@ -8,6 +8,7 @@
 
 from copy import deepcopy
 from typing import Any, Awaitable, TYPE_CHECKING
+from typing_extensions import Self
 
 from azure.core.pipeline import policies
 from azure.core.rest import AsyncHttpResponse, HttpRequest
@@ -20,11 +21,10 @@
 from .operations import StorageAccountsOperations, UsageOperations
 
 if TYPE_CHECKING:
-    # pylint: disable=unused-import,ungrouped-imports
     from azure.core.credentials_async import AsyncTokenCredential
 
 
-class StorageManagement:  # pylint: disable=client-accepts-api-version-keyword
+class StorageManagement:
     """The Azure Storage Management API.
 
     :ivar storage_accounts: StorageAccountsOperations operations
@@ -110,7 +110,7 @@ def _send_request(
     async def close(self) -> None:
         await self._client.close()
 
-    async def __aenter__(self) -> "StorageManagement":
+    async def __aenter__(self) -> Self:
         await self._client.__aenter__()
         return self
 
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_12_01/aio/operations/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_12_01/aio/operations/__init__.py
index 6f4f0606778e..442238573341 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_12_01/aio/operations/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_12_01/aio/operations/__init__.py
@@ -5,17 +5,23 @@
 # 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 ._storage_accounts_operations import StorageAccountsOperations
-from ._usage_operations import UsageOperations
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._storage_accounts_operations import StorageAccountsOperations  # type: ignore
+from ._usage_operations import UsageOperations  # 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__ = [
     "StorageAccountsOperations",
     "UsageOperations",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_12_01/aio/operations/_storage_accounts_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_12_01/aio/operations/_storage_accounts_operations.py
index 18293a865192..b978dfc406b1 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_12_01/aio/operations/_storage_accounts_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_12_01/aio/operations/_storage_accounts_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,7 @@
 # --------------------------------------------------------------------------
 from io import IOBase
 import sys
-from typing import Any, AsyncIterable, 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
@@ -18,12 +18,13 @@
     ResourceExistsError,
     ResourceNotFoundError,
     ResourceNotModifiedError,
+    StreamClosedError,
+    StreamConsumedError,
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
 from azure.core.polling import AsyncLROPoller, AsyncNoPolling, AsyncPollingMethod
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
@@ -31,7 +32,6 @@
 from azure.mgmt.core.polling.async_arm_polling import AsyncARMPolling
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._storage_accounts_operations import (
     build_check_name_availability_request,
     build_create_request,
@@ -49,7 +49,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]]
 
@@ -132,7 +132,7 @@ async def check_name_availability(
         :rtype: ~azure.mgmt.storage.v2016_12_01.models.CheckNameAvailabilityResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -164,7 +164,6 @@ async def check_name_availability(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -178,7 +177,7 @@ async def check_name_availability(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response)
+        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -191,8 +190,8 @@ async def _create_initial(
         account_name: str,
         parameters: Union[_models.StorageAccountCreateParameters, IO[bytes]],
         **kwargs: Any
-    ) -> Optional[_models.StorageAccount]:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -205,7 +204,7 @@ async def _create_initial(
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2016-12-01"))
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
-        cls: ClsType[Optional[_models.StorageAccount]] = kwargs.pop("cls", None)
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
         _json = None
@@ -226,10 +225,10 @@ async def _create_initial(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -237,12 +236,14 @@ async def _create_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = None
-        if response.status_code == 200:
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -368,10 +369,11 @@ async def begin_create(
                 params=_params,
                 **kwargs
             )
+            await raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+            deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
             if cls:
                 return cls(pipeline_response, deserialized, {})  # type: ignore
             return deserialized
@@ -394,9 +396,7 @@ def get_long_running_output(pipeline_response):
         )
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, **kwargs: Any
-    ) -> None:
+    async def delete(self, resource_group_name: str, account_name: str, **kwargs: Any) -> None:
         """Deletes a storage account in Microsoft Azure.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -410,7 +410,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,
@@ -432,7 +432,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -468,7 +467,7 @@ async def get_properties(
         :rtype: ~azure.mgmt.storage.v2016_12_01.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -490,7 +489,6 @@ async def get_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -504,7 +502,7 @@ async def get_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -615,7 +613,7 @@ async def update(
         :rtype: ~azure.mgmt.storage.v2016_12_01.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -649,7 +647,6 @@ async def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -663,7 +660,7 @@ async def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -686,7 +683,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.StorageAccount"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2016-12-01"))
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -703,7 +700,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -719,7 +715,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -769,7 +764,7 @@ def list_by_resource_group(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2016-12-01"))
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -787,7 +782,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -803,7 +797,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -849,7 +842,7 @@ async def list_keys(
         :rtype: ~azure.mgmt.storage.v2016_12_01.models.StorageAccountListKeysResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -871,7 +864,6 @@ async def list_keys(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -885,7 +877,7 @@ async def list_keys(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response)
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -978,7 +970,7 @@ async def regenerate_key(
         :rtype: ~azure.mgmt.storage.v2016_12_01.models.StorageAccountListKeysResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1012,7 +1004,6 @@ async def regenerate_key(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1026,7 +1017,7 @@ async def regenerate_key(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response)
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1117,7 +1108,7 @@ async def list_account_sas(
         :rtype: ~azure.mgmt.storage.v2016_12_01.models.ListAccountSasResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1151,7 +1142,6 @@ async def list_account_sas(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1165,7 +1155,7 @@ async def list_account_sas(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListAccountSasResponse", pipeline_response)
+        deserialized = self._deserialize("ListAccountSasResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1254,7 +1244,7 @@ async def list_service_sas(
         :rtype: ~azure.mgmt.storage.v2016_12_01.models.ListServiceSasResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1288,7 +1278,6 @@ async def list_service_sas(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1302,7 +1291,7 @@ async def list_service_sas(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListServiceSasResponse", pipeline_response)
+        deserialized = self._deserialize("ListServiceSasResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_12_01/aio/operations/_usage_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_12_01/aio/operations/_usage_operations.py
index c8829cd2187a..549ac245fa26 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_12_01/aio/operations/_usage_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_12_01/aio/operations/_usage_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
@@ -20,20 +19,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._usage_operations import build_list_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
 
@@ -72,7 +69,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.Usage"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2016-12-01"))
         cls: ClsType[_models.UsageListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -89,7 +86,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -105,7 +101,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_12_01/models/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_12_01/models/__init__.py
index 6ec79aa2654b..42ca12ca76b3 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_12_01/models/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_12_01/models/__init__.py
@@ -5,50 +5,61 @@
 # 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 AccountSasParameters
-from ._models_py3 import CheckNameAvailabilityResult
-from ._models_py3 import CustomDomain
-from ._models_py3 import Encryption
-from ._models_py3 import EncryptionService
-from ._models_py3 import EncryptionServices
-from ._models_py3 import Endpoints
-from ._models_py3 import ListAccountSasResponse
-from ._models_py3 import ListServiceSasResponse
-from ._models_py3 import Resource
-from ._models_py3 import ServiceSasParameters
-from ._models_py3 import Sku
-from ._models_py3 import StorageAccount
-from ._models_py3 import StorageAccountCheckNameAvailabilityParameters
-from ._models_py3 import StorageAccountCreateParameters
-from ._models_py3 import StorageAccountKey
-from ._models_py3 import StorageAccountListKeysResult
-from ._models_py3 import StorageAccountListResult
-from ._models_py3 import StorageAccountRegenerateKeyParameters
-from ._models_py3 import StorageAccountUpdateParameters
-from ._models_py3 import Usage
-from ._models_py3 import UsageListResult
-from ._models_py3 import UsageName
+from typing import TYPE_CHECKING
 
-from ._storage_management_enums import AccessTier
-from ._storage_management_enums import AccountSasParametersSignedPermission
-from ._storage_management_enums import AccountSasParametersSignedResourceTypes
-from ._storage_management_enums import AccountSasParametersSignedServices
-from ._storage_management_enums import AccountStatus
-from ._storage_management_enums import EncryptionKeySource
-from ._storage_management_enums import HttpProtocol
-from ._storage_management_enums import KeyPermission
-from ._storage_management_enums import Kind
-from ._storage_management_enums import Permissions
-from ._storage_management_enums import ProvisioningState
-from ._storage_management_enums import Reason
-from ._storage_management_enums import SignedResource
-from ._storage_management_enums import SkuName
-from ._storage_management_enums import SkuTier
-from ._storage_management_enums import StorageAccountCheckNameAvailabilityParametersType
-from ._storage_management_enums import UsageUnit
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+
+from ._models_py3 import (  # type: ignore
+    AccountSasParameters,
+    CheckNameAvailabilityResult,
+    CustomDomain,
+    Encryption,
+    EncryptionService,
+    EncryptionServices,
+    Endpoints,
+    ListAccountSasResponse,
+    ListServiceSasResponse,
+    Resource,
+    ServiceSasParameters,
+    Sku,
+    StorageAccount,
+    StorageAccountCheckNameAvailabilityParameters,
+    StorageAccountCreateParameters,
+    StorageAccountKey,
+    StorageAccountListKeysResult,
+    StorageAccountListResult,
+    StorageAccountRegenerateKeyParameters,
+    StorageAccountUpdateParameters,
+    Usage,
+    UsageListResult,
+    UsageName,
+)
+
+from ._storage_management_enums import (  # type: ignore
+    AccessTier,
+    AccountSasParametersSignedPermission,
+    AccountSasParametersSignedResourceTypes,
+    AccountSasParametersSignedServices,
+    AccountStatus,
+    EncryptionKeySource,
+    HttpProtocol,
+    KeyPermission,
+    Kind,
+    Permissions,
+    ProvisioningState,
+    Reason,
+    SignedResource,
+    SkuName,
+    SkuTier,
+    StorageAccountCheckNameAvailabilityParametersType,
+    UsageUnit,
+)
 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__ = [
@@ -93,5 +104,5 @@
     "StorageAccountCheckNameAvailabilityParametersType",
     "UsageUnit",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_12_01/models/_models_py3.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_12_01/models/_models_py3.py
index 1439256ff1e5..dba5e428457e 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_12_01/models/_models_py3.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_12_01/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
 
 
@@ -451,7 +450,7 @@ def __init__(self, *, location: Optional[str] = None, tags: Optional[Dict[str, s
         self.tags = tags
 
 
-class ServiceSasParameters(_serialization.Model):  # pylint: disable=too-many-instance-attributes
+class ServiceSasParameters(_serialization.Model):
     """The parameters to list service SAS credentials of a specific resource.
 
     All required parameters must be populated in order to send to server.
@@ -656,7 +655,7 @@ def __init__(self, *, name: Union[str, "_models.SkuName"], **kwargs: Any) -> Non
         self.tier = None
 
 
-class StorageAccount(Resource):  # pylint: disable=too-many-instance-attributes
+class StorageAccount(Resource):
     """The storage account.
 
     Variables are only populated by the server, and will be ignored when sending a request.
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_12_01/operations/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_12_01/operations/__init__.py
index 6f4f0606778e..442238573341 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_12_01/operations/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_12_01/operations/__init__.py
@@ -5,17 +5,23 @@
 # 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 ._storage_accounts_operations import StorageAccountsOperations
-from ._usage_operations import UsageOperations
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._storage_accounts_operations import StorageAccountsOperations  # type: ignore
+from ._usage_operations import UsageOperations  # 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__ = [
     "StorageAccountsOperations",
     "UsageOperations",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_12_01/operations/_storage_accounts_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_12_01/operations/_storage_accounts_operations.py
index 981fccbf45ca..5518d84f94ca 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_12_01/operations/_storage_accounts_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_12_01/operations/_storage_accounts_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,7 @@
 # --------------------------------------------------------------------------
 from io import IOBase
 import sys
-from typing import Any, Callable, Dict, IO, Iterable, 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 (
@@ -17,13 +17,14 @@
     ResourceExistsError,
     ResourceNotFoundError,
     ResourceNotModifiedError,
+    StreamClosedError,
+    StreamConsumedError,
     map_error,
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
 from azure.core.polling import LROPoller, NoPolling, PollingMethod
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
@@ -31,12 +32,11 @@
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -478,7 +478,7 @@ def check_name_availability(
         :rtype: ~azure.mgmt.storage.v2016_12_01.models.CheckNameAvailabilityResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -510,7 +510,6 @@ def check_name_availability(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -524,7 +523,7 @@ def check_name_availability(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response)
+        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -537,8 +536,8 @@ def _create_initial(
         account_name: str,
         parameters: Union[_models.StorageAccountCreateParameters, IO[bytes]],
         **kwargs: Any
-    ) -> Optional[_models.StorageAccount]:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> Iterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -551,7 +550,7 @@ def _create_initial(
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2016-12-01"))
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
-        cls: ClsType[Optional[_models.StorageAccount]] = kwargs.pop("cls", None)
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
         _json = None
@@ -572,10 +571,10 @@ def _create_initial(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -583,12 +582,14 @@ def _create_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = None
-        if response.status_code == 200:
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -711,10 +712,11 @@ def begin_create(
                 params=_params,
                 **kwargs
             )
+            raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+            deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
             if cls:
                 return cls(pipeline_response, deserialized, {})  # type: ignore
             return deserialized
@@ -753,7 +755,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,
@@ -775,7 +777,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -809,7 +810,7 @@ def get_properties(self, resource_group_name: str, account_name: str, **kwargs:
         :rtype: ~azure.mgmt.storage.v2016_12_01.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -831,7 +832,6 @@ def get_properties(self, resource_group_name: str, account_name: str, **kwargs:
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -845,7 +845,7 @@ def get_properties(self, resource_group_name: str, account_name: str, **kwargs:
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -956,7 +956,7 @@ def update(
         :rtype: ~azure.mgmt.storage.v2016_12_01.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -990,7 +990,6 @@ def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1004,7 +1003,7 @@ def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1026,7 +1025,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.StorageAccount"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2016-12-01"))
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1043,7 +1042,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -1059,7 +1057,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -1106,7 +1103,7 @@ def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> Ite
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2016-12-01"))
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1124,7 +1121,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -1140,7 +1136,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -1186,7 +1181,7 @@ def list_keys(
         :rtype: ~azure.mgmt.storage.v2016_12_01.models.StorageAccountListKeysResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1208,7 +1203,6 @@ def list_keys(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1222,7 +1216,7 @@ def list_keys(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response)
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1315,7 +1309,7 @@ def regenerate_key(
         :rtype: ~azure.mgmt.storage.v2016_12_01.models.StorageAccountListKeysResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1349,7 +1343,6 @@ def regenerate_key(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1363,7 +1356,7 @@ def regenerate_key(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response)
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1454,7 +1447,7 @@ def list_account_sas(
         :rtype: ~azure.mgmt.storage.v2016_12_01.models.ListAccountSasResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1488,7 +1481,6 @@ def list_account_sas(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1502,7 +1494,7 @@ def list_account_sas(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListAccountSasResponse", pipeline_response)
+        deserialized = self._deserialize("ListAccountSasResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1591,7 +1583,7 @@ def list_service_sas(
         :rtype: ~azure.mgmt.storage.v2016_12_01.models.ListServiceSasResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1625,7 +1617,6 @@ def list_service_sas(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1639,7 +1630,7 @@ def list_service_sas(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListServiceSasResponse", pipeline_response)
+        deserialized = self._deserialize("ListServiceSasResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_12_01/operations/_usage_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_12_01/operations/_usage_operations.py
index 1763e0c4bb26..f8944d050cc9 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_12_01/operations/_usage_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2016_12_01/operations/_usage_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 (
@@ -20,20 +19,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -99,7 +96,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.Usage"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2016-12-01"))
         cls: ClsType[_models.UsageListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -116,7 +113,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -132,7 +128,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/__init__.py
index ebdc1d61615b..17522f0d6d17 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/__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 ._storage_management import StorageManagement
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._storage_management import StorageManagement  # 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__ = [
     "StorageManagement",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/_configuration.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/_configuration.py
index e27394844bfd..7557dc4809fd 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/_configuration.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/_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 StorageManagementConfiguration:  # pylint: disable=too-many-instance-attributes,name-too-long
+class StorageManagementConfiguration:  # pylint: disable=too-many-instance-attributes
     """Configuration for StorageManagement.
 
     Note that all parameters used to create this instance are saved as instance
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/_metadata.json b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/_metadata.json
index b4b43b89dad4..e843922043be 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/_metadata.json
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/_metadata.json
@@ -10,8 +10,8 @@
         "azure_arm": true,
         "has_public_lro_operations": true,
         "client_side_validation": false,
-        "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"ARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementConfiguration\"], \".._serialization\": [\"Deserializer\", \"Serializer\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}}",
-        "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"AsyncARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"AsyncARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementConfiguration\"], \"..._serialization\": [\"Deserializer\", \"Serializer\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"]}}}"
+        "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"ARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementConfiguration\"], \".._serialization\": [\"Deserializer\", \"Serializer\"]}, \"stdlib\": {\"typing_extensions\": [\"Self\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}}",
+        "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"AsyncARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"AsyncARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementConfiguration\"], \"..._serialization\": [\"Deserializer\", \"Serializer\"]}, \"stdlib\": {\"typing_extensions\": [\"Self\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"]}}}"
     },
     "global_parameters": {
         "sync": {
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/_storage_management.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/_storage_management.py
index 8e0af196437c..3b512565be5d 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/_storage_management.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/_storage_management.py
@@ -8,6 +8,7 @@
 
 from copy import deepcopy
 from typing import Any, TYPE_CHECKING
+from typing_extensions import Self
 
 from azure.core.pipeline import policies
 from azure.core.rest import HttpRequest, HttpResponse
@@ -20,11 +21,10 @@
 from .operations import Operations, SkusOperations, StorageAccountsOperations, UsageOperations
 
 if TYPE_CHECKING:
-    # pylint: disable=unused-import,ungrouped-imports
     from azure.core.credentials import TokenCredential
 
 
-class StorageManagement:  # pylint: disable=client-accepts-api-version-keyword
+class StorageManagement:
     """The Azure Storage Management API.
 
     :ivar operations: Operations operations
@@ -113,7 +113,7 @@ def _send_request(self, request: HttpRequest, *, stream: bool = False, **kwargs:
     def close(self) -> None:
         self._client.close()
 
-    def __enter__(self) -> "StorageManagement":
+    def __enter__(self) -> Self:
         self._client.__enter__()
         return self
 
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/_vendor.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/_vendor.py
deleted file mode 100644
index 0dafe0e287ff..000000000000
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/_vendor.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# --------------------------------------------------------------------------
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License. See License.txt in the project root for license information.
-# Code generated by Microsoft (R) AutoRest Code Generator.
-# Changes may cause incorrect behavior and will be lost if the code is regenerated.
-# --------------------------------------------------------------------------
-
-from azure.core.pipeline.transport import HttpRequest
-
-
-def _convert_request(request, files=None):
-    data = request.content if not files else None
-    request = HttpRequest(method=request.method, url=request.url, headers=request.headers, data=data)
-    if files:
-        request.set_formdata_body(files)
-    return request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/_version.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/_version.py
index 83bf7bbed684..e5754a47ce68 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/_version.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/_version.py
@@ -6,4 +6,4 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-VERSION = "21.2.1"
+VERSION = "1.0.0b1"
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/aio/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/aio/__init__.py
index 2ef22c4bc437..dcbae2659e8b 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/aio/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/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 ._storage_management import StorageManagement
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._storage_management import StorageManagement  # 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__ = [
     "StorageManagement",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/aio/_configuration.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/aio/_configuration.py
index fa18f5c958e5..6e16daa81de8 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/aio/_configuration.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/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 StorageManagementConfiguration:  # pylint: disable=too-many-instance-attributes,name-too-long
+class StorageManagementConfiguration:  # pylint: disable=too-many-instance-attributes
     """Configuration for StorageManagement.
 
     Note that all parameters used to create this instance are saved as instance
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/aio/_storage_management.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/aio/_storage_management.py
index 1b663a575503..0bf5288b2c6b 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/aio/_storage_management.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/aio/_storage_management.py
@@ -8,6 +8,7 @@
 
 from copy import deepcopy
 from typing import Any, Awaitable, TYPE_CHECKING
+from typing_extensions import Self
 
 from azure.core.pipeline import policies
 from azure.core.rest import AsyncHttpResponse, HttpRequest
@@ -20,11 +21,10 @@
 from .operations import Operations, SkusOperations, StorageAccountsOperations, UsageOperations
 
 if TYPE_CHECKING:
-    # pylint: disable=unused-import,ungrouped-imports
     from azure.core.credentials_async import AsyncTokenCredential
 
 
-class StorageManagement:  # pylint: disable=client-accepts-api-version-keyword
+class StorageManagement:
     """The Azure Storage Management API.
 
     :ivar operations: Operations operations
@@ -116,7 +116,7 @@ def _send_request(
     async def close(self) -> None:
         await self._client.close()
 
-    async def __aenter__(self) -> "StorageManagement":
+    async def __aenter__(self) -> Self:
         await self._client.__aenter__()
         return self
 
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/aio/operations/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/aio/operations/__init__.py
index 31ab94a0a14c..82f79dffd3fb 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/aio/operations/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/aio/operations/__init__.py
@@ -5,14 +5,20 @@
 # 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 ._skus_operations import SkusOperations
-from ._storage_accounts_operations import StorageAccountsOperations
-from ._usage_operations import UsageOperations
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._operations import Operations  # type: ignore
+from ._skus_operations import SkusOperations  # type: ignore
+from ._storage_accounts_operations import StorageAccountsOperations  # type: ignore
+from ._usage_operations import UsageOperations  # 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__ = [
@@ -21,5 +27,5 @@
     "StorageAccountsOperations",
     "UsageOperations",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/aio/operations/_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/aio/operations/_operations.py
index 55a8c1dc6300..ec54a90bc353 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/aio/operations/_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/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
@@ -20,20 +19,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._operations import build_list_request
 
 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]]
 
@@ -73,7 +70,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.Operation"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-06-01"))
         cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -89,7 +86,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -105,7 +101,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/aio/operations/_skus_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/aio/operations/_skus_operations.py
index e54fbd1ab774..85bdd533f836 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/aio/operations/_skus_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/aio/operations/_skus_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
@@ -20,20 +19,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._skus_operations import build_list_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
 
@@ -72,7 +69,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.Sku"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-06-01"))
         cls: ClsType[_models.StorageSkuListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -89,7 +86,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -105,7 +101,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/aio/operations/_storage_accounts_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/aio/operations/_storage_accounts_operations.py
index 8b2603496358..73888be441d2 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/aio/operations/_storage_accounts_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/aio/operations/_storage_accounts_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,7 @@
 # --------------------------------------------------------------------------
 from io import IOBase
 import sys
-from typing import Any, AsyncIterable, 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
@@ -18,12 +18,13 @@
     ResourceExistsError,
     ResourceNotFoundError,
     ResourceNotModifiedError,
+    StreamClosedError,
+    StreamConsumedError,
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
 from azure.core.polling import AsyncLROPoller, AsyncNoPolling, AsyncPollingMethod
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
@@ -31,7 +32,6 @@
 from azure.mgmt.core.polling.async_arm_polling import AsyncARMPolling
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._storage_accounts_operations import (
     build_check_name_availability_request,
     build_create_request,
@@ -49,7 +49,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]]
 
@@ -132,7 +132,7 @@ async def check_name_availability(
         :rtype: ~azure.mgmt.storage.v2017_06_01.models.CheckNameAvailabilityResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -164,7 +164,6 @@ async def check_name_availability(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -178,7 +177,7 @@ async def check_name_availability(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response)
+        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -191,8 +190,8 @@ async def _create_initial(
         account_name: str,
         parameters: Union[_models.StorageAccountCreateParameters, IO[bytes]],
         **kwargs: Any
-    ) -> Optional[_models.StorageAccount]:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -205,7 +204,7 @@ async def _create_initial(
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-06-01"))
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
-        cls: ClsType[Optional[_models.StorageAccount]] = kwargs.pop("cls", None)
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
         _json = None
@@ -226,10 +225,10 @@ async def _create_initial(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -237,12 +236,14 @@ async def _create_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = None
-        if response.status_code == 200:
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -368,10 +369,11 @@ async def begin_create(
                 params=_params,
                 **kwargs
             )
+            await raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+            deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
             if cls:
                 return cls(pipeline_response, deserialized, {})  # type: ignore
             return deserialized
@@ -394,9 +396,7 @@ def get_long_running_output(pipeline_response):
         )
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, **kwargs: Any
-    ) -> None:
+    async def delete(self, resource_group_name: str, account_name: str, **kwargs: Any) -> None:
         """Deletes a storage account in Microsoft Azure.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -410,7 +410,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,
@@ -432,7 +432,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -468,7 +467,7 @@ async def get_properties(
         :rtype: ~azure.mgmt.storage.v2017_06_01.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -490,7 +489,6 @@ async def get_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -504,7 +502,7 @@ async def get_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -615,7 +613,7 @@ async def update(
         :rtype: ~azure.mgmt.storage.v2017_06_01.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -649,7 +647,6 @@ async def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -663,7 +660,7 @@ async def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -686,7 +683,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.StorageAccount"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-06-01"))
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -703,7 +700,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -719,7 +715,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -769,7 +764,7 @@ def list_by_resource_group(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-06-01"))
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -787,7 +782,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -803,7 +797,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -849,7 +842,7 @@ async def list_keys(
         :rtype: ~azure.mgmt.storage.v2017_06_01.models.StorageAccountListKeysResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -871,7 +864,6 @@ async def list_keys(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -885,7 +877,7 @@ async def list_keys(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response)
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -978,7 +970,7 @@ async def regenerate_key(
         :rtype: ~azure.mgmt.storage.v2017_06_01.models.StorageAccountListKeysResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1012,7 +1004,6 @@ async def regenerate_key(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1026,7 +1017,7 @@ async def regenerate_key(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response)
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1117,7 +1108,7 @@ async def list_account_sas(
         :rtype: ~azure.mgmt.storage.v2017_06_01.models.ListAccountSasResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1151,7 +1142,6 @@ async def list_account_sas(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1165,7 +1155,7 @@ async def list_account_sas(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListAccountSasResponse", pipeline_response)
+        deserialized = self._deserialize("ListAccountSasResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1254,7 +1244,7 @@ async def list_service_sas(
         :rtype: ~azure.mgmt.storage.v2017_06_01.models.ListServiceSasResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1288,7 +1278,6 @@ async def list_service_sas(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1302,7 +1291,7 @@ async def list_service_sas(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListServiceSasResponse", pipeline_response)
+        deserialized = self._deserialize("ListServiceSasResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/aio/operations/_usage_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/aio/operations/_usage_operations.py
index ee0c5ccba978..484bce0afa39 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/aio/operations/_usage_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/aio/operations/_usage_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
@@ -20,20 +19,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._usage_operations import build_list_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
 
@@ -72,7 +69,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.Usage"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-06-01"))
         cls: ClsType[_models.UsageListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -89,7 +86,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -105,7 +101,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/models/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/models/__init__.py
index facc79b3796a..f56c2d598d3f 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/models/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/models/__init__.py
@@ -5,66 +5,77 @@
 # 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 AccountSasParameters
-from ._models_py3 import CheckNameAvailabilityResult
-from ._models_py3 import CustomDomain
-from ._models_py3 import Dimension
-from ._models_py3 import Encryption
-from ._models_py3 import EncryptionService
-from ._models_py3 import EncryptionServices
-from ._models_py3 import Endpoints
-from ._models_py3 import IPRule
-from ._models_py3 import Identity
-from ._models_py3 import KeyVaultProperties
-from ._models_py3 import ListAccountSasResponse
-from ._models_py3 import ListServiceSasResponse
-from ._models_py3 import MetricSpecification
-from ._models_py3 import NetworkRuleSet
-from ._models_py3 import Operation
-from ._models_py3 import OperationDisplay
-from ._models_py3 import OperationListResult
-from ._models_py3 import Resource
-from ._models_py3 import Restriction
-from ._models_py3 import SKUCapability
-from ._models_py3 import ServiceSasParameters
-from ._models_py3 import ServiceSpecification
-from ._models_py3 import Sku
-from ._models_py3 import StorageAccount
-from ._models_py3 import StorageAccountCheckNameAvailabilityParameters
-from ._models_py3 import StorageAccountCreateParameters
-from ._models_py3 import StorageAccountKey
-from ._models_py3 import StorageAccountListKeysResult
-from ._models_py3 import StorageAccountListResult
-from ._models_py3 import StorageAccountRegenerateKeyParameters
-from ._models_py3 import StorageAccountUpdateParameters
-from ._models_py3 import StorageSkuListResult
-from ._models_py3 import Usage
-from ._models_py3 import UsageListResult
-from ._models_py3 import UsageName
-from ._models_py3 import VirtualNetworkRule
+from typing import TYPE_CHECKING
 
-from ._storage_management_enums import AccessTier
-from ._storage_management_enums import AccountStatus
-from ._storage_management_enums import Bypass
-from ._storage_management_enums import DefaultAction
-from ._storage_management_enums import HttpProtocol
-from ._storage_management_enums import KeyPermission
-from ._storage_management_enums import KeySource
-from ._storage_management_enums import Kind
-from ._storage_management_enums import Permissions
-from ._storage_management_enums import ProvisioningState
-from ._storage_management_enums import Reason
-from ._storage_management_enums import ReasonCode
-from ._storage_management_enums import Services
-from ._storage_management_enums import SignedResource
-from ._storage_management_enums import SignedResourceTypes
-from ._storage_management_enums import SkuName
-from ._storage_management_enums import SkuTier
-from ._storage_management_enums import State
-from ._storage_management_enums import UsageUnit
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+
+from ._models_py3 import (  # type: ignore
+    AccountSasParameters,
+    CheckNameAvailabilityResult,
+    CustomDomain,
+    Dimension,
+    Encryption,
+    EncryptionService,
+    EncryptionServices,
+    Endpoints,
+    IPRule,
+    Identity,
+    KeyVaultProperties,
+    ListAccountSasResponse,
+    ListServiceSasResponse,
+    MetricSpecification,
+    NetworkRuleSet,
+    Operation,
+    OperationDisplay,
+    OperationListResult,
+    Resource,
+    Restriction,
+    SKUCapability,
+    ServiceSasParameters,
+    ServiceSpecification,
+    Sku,
+    StorageAccount,
+    StorageAccountCheckNameAvailabilityParameters,
+    StorageAccountCreateParameters,
+    StorageAccountKey,
+    StorageAccountListKeysResult,
+    StorageAccountListResult,
+    StorageAccountRegenerateKeyParameters,
+    StorageAccountUpdateParameters,
+    StorageSkuListResult,
+    Usage,
+    UsageListResult,
+    UsageName,
+    VirtualNetworkRule,
+)
+
+from ._storage_management_enums import (  # type: ignore
+    AccessTier,
+    AccountStatus,
+    Bypass,
+    DefaultAction,
+    HttpProtocol,
+    KeyPermission,
+    KeySource,
+    Kind,
+    Permissions,
+    ProvisioningState,
+    Reason,
+    ReasonCode,
+    Services,
+    SignedResource,
+    SignedResourceTypes,
+    SkuName,
+    SkuTier,
+    State,
+    UsageUnit,
+)
 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__ = [
@@ -125,5 +136,5 @@
     "State",
     "UsageUnit",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/models/_models_py3.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/models/_models_py3.py
index e012bfb9bd9b..adb8e2a6515d 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/models/_models_py3.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/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
 
 
@@ -879,7 +878,7 @@ def __init__(self, *, reason_code: Optional[Union[str, "_models.ReasonCode"]] =
         self.reason_code = reason_code
 
 
-class ServiceSasParameters(_serialization.Model):  # pylint: disable=too-many-instance-attributes
+class ServiceSasParameters(_serialization.Model):
     """The parameters to list service SAS credentials of a specific resource.
 
     All required parameters must be populated in order to send to server.
@@ -1175,7 +1174,7 @@ def __init__(self, **kwargs: Any) -> None:
         self.value = None
 
 
-class StorageAccount(Resource):  # pylint: disable=too-many-instance-attributes
+class StorageAccount(Resource):
     """The storage account.
 
     Variables are only populated by the server, and will be ignored when sending a request.
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/operations/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/operations/__init__.py
index 31ab94a0a14c..82f79dffd3fb 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/operations/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/operations/__init__.py
@@ -5,14 +5,20 @@
 # 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 ._skus_operations import SkusOperations
-from ._storage_accounts_operations import StorageAccountsOperations
-from ._usage_operations import UsageOperations
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._operations import Operations  # type: ignore
+from ._skus_operations import SkusOperations  # type: ignore
+from ._storage_accounts_operations import StorageAccountsOperations  # type: ignore
+from ._usage_operations import UsageOperations  # 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__ = [
@@ -21,5 +27,5 @@
     "StorageAccountsOperations",
     "UsageOperations",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/operations/_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/operations/_operations.py
index bcb68adbb087..17612887387b 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/operations/_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/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 (
@@ -20,20 +19,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -94,7 +91,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.Operation"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-06-01"))
         cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -110,7 +107,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -126,7 +122,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/operations/_skus_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/operations/_skus_operations.py
index b1ded8632765..892b8efa6c99 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/operations/_skus_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/operations/_skus_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 (
@@ -20,20 +19,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -99,7 +96,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.Sku"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-06-01"))
         cls: ClsType[_models.StorageSkuListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -116,7 +113,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -132,7 +128,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/operations/_storage_accounts_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/operations/_storage_accounts_operations.py
index e7abb7a05e80..5def5533c0ea 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/operations/_storage_accounts_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/operations/_storage_accounts_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,7 @@
 # --------------------------------------------------------------------------
 from io import IOBase
 import sys
-from typing import Any, Callable, Dict, IO, Iterable, 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 (
@@ -17,13 +17,14 @@
     ResourceExistsError,
     ResourceNotFoundError,
     ResourceNotModifiedError,
+    StreamClosedError,
+    StreamConsumedError,
     map_error,
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
 from azure.core.polling import LROPoller, NoPolling, PollingMethod
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
@@ -31,12 +32,11 @@
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -478,7 +478,7 @@ def check_name_availability(
         :rtype: ~azure.mgmt.storage.v2017_06_01.models.CheckNameAvailabilityResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -510,7 +510,6 @@ def check_name_availability(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -524,7 +523,7 @@ def check_name_availability(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response)
+        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -537,8 +536,8 @@ def _create_initial(
         account_name: str,
         parameters: Union[_models.StorageAccountCreateParameters, IO[bytes]],
         **kwargs: Any
-    ) -> Optional[_models.StorageAccount]:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> Iterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -551,7 +550,7 @@ def _create_initial(
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-06-01"))
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
-        cls: ClsType[Optional[_models.StorageAccount]] = kwargs.pop("cls", None)
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
         _json = None
@@ -572,10 +571,10 @@ def _create_initial(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -583,12 +582,14 @@ def _create_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = None
-        if response.status_code == 200:
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -711,10 +712,11 @@ def begin_create(
                 params=_params,
                 **kwargs
             )
+            raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+            deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
             if cls:
                 return cls(pipeline_response, deserialized, {})  # type: ignore
             return deserialized
@@ -753,7 +755,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,
@@ -775,7 +777,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -809,7 +810,7 @@ def get_properties(self, resource_group_name: str, account_name: str, **kwargs:
         :rtype: ~azure.mgmt.storage.v2017_06_01.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -831,7 +832,6 @@ def get_properties(self, resource_group_name: str, account_name: str, **kwargs:
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -845,7 +845,7 @@ def get_properties(self, resource_group_name: str, account_name: str, **kwargs:
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -956,7 +956,7 @@ def update(
         :rtype: ~azure.mgmt.storage.v2017_06_01.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -990,7 +990,6 @@ def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1004,7 +1003,7 @@ def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1026,7 +1025,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.StorageAccount"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-06-01"))
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1043,7 +1042,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -1059,7 +1057,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -1106,7 +1103,7 @@ def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> Ite
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-06-01"))
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1124,7 +1121,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -1140,7 +1136,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -1186,7 +1181,7 @@ def list_keys(
         :rtype: ~azure.mgmt.storage.v2017_06_01.models.StorageAccountListKeysResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1208,7 +1203,6 @@ def list_keys(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1222,7 +1216,7 @@ def list_keys(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response)
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1315,7 +1309,7 @@ def regenerate_key(
         :rtype: ~azure.mgmt.storage.v2017_06_01.models.StorageAccountListKeysResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1349,7 +1343,6 @@ def regenerate_key(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1363,7 +1356,7 @@ def regenerate_key(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response)
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1454,7 +1447,7 @@ def list_account_sas(
         :rtype: ~azure.mgmt.storage.v2017_06_01.models.ListAccountSasResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1488,7 +1481,6 @@ def list_account_sas(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1502,7 +1494,7 @@ def list_account_sas(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListAccountSasResponse", pipeline_response)
+        deserialized = self._deserialize("ListAccountSasResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1591,7 +1583,7 @@ def list_service_sas(
         :rtype: ~azure.mgmt.storage.v2017_06_01.models.ListServiceSasResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1625,7 +1617,6 @@ def list_service_sas(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1639,7 +1630,7 @@ def list_service_sas(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListServiceSasResponse", pipeline_response)
+        deserialized = self._deserialize("ListServiceSasResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/operations/_usage_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/operations/_usage_operations.py
index 0a42f4cc9a4c..182be5629515 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/operations/_usage_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_06_01/operations/_usage_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 (
@@ -20,20 +19,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -99,7 +96,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.Usage"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-06-01"))
         cls: ClsType[_models.UsageListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -116,7 +113,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -132,7 +128,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/__init__.py
index ebdc1d61615b..17522f0d6d17 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/__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 ._storage_management import StorageManagement
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._storage_management import StorageManagement  # 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__ = [
     "StorageManagement",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/_configuration.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/_configuration.py
index e9160a98d485..165810133ed9 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/_configuration.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/_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 StorageManagementConfiguration:  # pylint: disable=too-many-instance-attributes,name-too-long
+class StorageManagementConfiguration:  # pylint: disable=too-many-instance-attributes
     """Configuration for StorageManagement.
 
     Note that all parameters used to create this instance are saved as instance
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/_metadata.json b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/_metadata.json
index 3483d607603e..4925a26ad8dd 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/_metadata.json
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/_metadata.json
@@ -10,8 +10,8 @@
         "azure_arm": true,
         "has_public_lro_operations": true,
         "client_side_validation": false,
-        "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"ARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementConfiguration\"], \".._serialization\": [\"Deserializer\", \"Serializer\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}}",
-        "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"AsyncARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"AsyncARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementConfiguration\"], \"..._serialization\": [\"Deserializer\", \"Serializer\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"]}}}"
+        "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"ARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementConfiguration\"], \".._serialization\": [\"Deserializer\", \"Serializer\"]}, \"stdlib\": {\"typing_extensions\": [\"Self\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}}",
+        "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"AsyncARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"AsyncARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementConfiguration\"], \"..._serialization\": [\"Deserializer\", \"Serializer\"]}, \"stdlib\": {\"typing_extensions\": [\"Self\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"]}}}"
     },
     "global_parameters": {
         "sync": {
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/_storage_management.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/_storage_management.py
index e70c762bb6b8..8e7f69c38871 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/_storage_management.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/_storage_management.py
@@ -8,6 +8,7 @@
 
 from copy import deepcopy
 from typing import Any, TYPE_CHECKING
+from typing_extensions import Self
 
 from azure.core.pipeline import policies
 from azure.core.rest import HttpRequest, HttpResponse
@@ -20,11 +21,10 @@
 from .operations import Operations, SkusOperations, StorageAccountsOperations, UsageOperations
 
 if TYPE_CHECKING:
-    # pylint: disable=unused-import,ungrouped-imports
     from azure.core.credentials import TokenCredential
 
 
-class StorageManagement:  # pylint: disable=client-accepts-api-version-keyword
+class StorageManagement:
     """The Azure Storage Management API.
 
     :ivar operations: Operations operations
@@ -113,7 +113,7 @@ def _send_request(self, request: HttpRequest, *, stream: bool = False, **kwargs:
     def close(self) -> None:
         self._client.close()
 
-    def __enter__(self) -> "StorageManagement":
+    def __enter__(self) -> Self:
         self._client.__enter__()
         return self
 
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/_vendor.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/_vendor.py
deleted file mode 100644
index 0dafe0e287ff..000000000000
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/_vendor.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# --------------------------------------------------------------------------
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License. See License.txt in the project root for license information.
-# Code generated by Microsoft (R) AutoRest Code Generator.
-# Changes may cause incorrect behavior and will be lost if the code is regenerated.
-# --------------------------------------------------------------------------
-
-from azure.core.pipeline.transport import HttpRequest
-
-
-def _convert_request(request, files=None):
-    data = request.content if not files else None
-    request = HttpRequest(method=request.method, url=request.url, headers=request.headers, data=data)
-    if files:
-        request.set_formdata_body(files)
-    return request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/_version.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/_version.py
index 83bf7bbed684..e5754a47ce68 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/_version.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/_version.py
@@ -6,4 +6,4 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-VERSION = "21.2.1"
+VERSION = "1.0.0b1"
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/aio/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/aio/__init__.py
index 2ef22c4bc437..dcbae2659e8b 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/aio/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/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 ._storage_management import StorageManagement
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._storage_management import StorageManagement  # 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__ = [
     "StorageManagement",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/aio/_configuration.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/aio/_configuration.py
index 78a95de1e473..b2fba38435a2 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/aio/_configuration.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/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 StorageManagementConfiguration:  # pylint: disable=too-many-instance-attributes,name-too-long
+class StorageManagementConfiguration:  # pylint: disable=too-many-instance-attributes
     """Configuration for StorageManagement.
 
     Note that all parameters used to create this instance are saved as instance
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/aio/_storage_management.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/aio/_storage_management.py
index 726cc155f1c9..b1d55079ba73 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/aio/_storage_management.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/aio/_storage_management.py
@@ -8,6 +8,7 @@
 
 from copy import deepcopy
 from typing import Any, Awaitable, TYPE_CHECKING
+from typing_extensions import Self
 
 from azure.core.pipeline import policies
 from azure.core.rest import AsyncHttpResponse, HttpRequest
@@ -20,11 +21,10 @@
 from .operations import Operations, SkusOperations, StorageAccountsOperations, UsageOperations
 
 if TYPE_CHECKING:
-    # pylint: disable=unused-import,ungrouped-imports
     from azure.core.credentials_async import AsyncTokenCredential
 
 
-class StorageManagement:  # pylint: disable=client-accepts-api-version-keyword
+class StorageManagement:
     """The Azure Storage Management API.
 
     :ivar operations: Operations operations
@@ -116,7 +116,7 @@ def _send_request(
     async def close(self) -> None:
         await self._client.close()
 
-    async def __aenter__(self) -> "StorageManagement":
+    async def __aenter__(self) -> Self:
         await self._client.__aenter__()
         return self
 
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/aio/operations/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/aio/operations/__init__.py
index 31ab94a0a14c..82f79dffd3fb 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/aio/operations/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/aio/operations/__init__.py
@@ -5,14 +5,20 @@
 # 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 ._skus_operations import SkusOperations
-from ._storage_accounts_operations import StorageAccountsOperations
-from ._usage_operations import UsageOperations
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._operations import Operations  # type: ignore
+from ._skus_operations import SkusOperations  # type: ignore
+from ._storage_accounts_operations import StorageAccountsOperations  # type: ignore
+from ._usage_operations import UsageOperations  # 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__ = [
@@ -21,5 +27,5 @@
     "StorageAccountsOperations",
     "UsageOperations",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/aio/operations/_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/aio/operations/_operations.py
index a5aaccc7964c..bcbd3156318b 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/aio/operations/_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/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
@@ -20,20 +19,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._operations import build_list_request
 
 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]]
 
@@ -73,7 +70,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.Operation"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-10-01"))
         cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -89,7 +86,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -105,7 +101,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/aio/operations/_skus_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/aio/operations/_skus_operations.py
index 25f1d84fc141..aabda291af58 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/aio/operations/_skus_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/aio/operations/_skus_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
@@ -20,20 +19,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._skus_operations import build_list_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
 
@@ -72,7 +69,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.Sku"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-10-01"))
         cls: ClsType[_models.StorageSkuListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -89,7 +86,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -105,7 +101,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/aio/operations/_storage_accounts_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/aio/operations/_storage_accounts_operations.py
index 4a6de0c283b6..5f207b31e949 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/aio/operations/_storage_accounts_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/aio/operations/_storage_accounts_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,7 @@
 # --------------------------------------------------------------------------
 from io import IOBase
 import sys
-from typing import Any, AsyncIterable, 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
@@ -18,12 +18,13 @@
     ResourceExistsError,
     ResourceNotFoundError,
     ResourceNotModifiedError,
+    StreamClosedError,
+    StreamConsumedError,
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
 from azure.core.polling import AsyncLROPoller, AsyncNoPolling, AsyncPollingMethod
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
@@ -31,7 +32,6 @@
 from azure.mgmt.core.polling.async_arm_polling import AsyncARMPolling
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._storage_accounts_operations import (
     build_check_name_availability_request,
     build_create_request,
@@ -49,7 +49,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]]
 
@@ -132,7 +132,7 @@ async def check_name_availability(
         :rtype: ~azure.mgmt.storage.v2017_10_01.models.CheckNameAvailabilityResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -164,7 +164,6 @@ async def check_name_availability(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -178,7 +177,7 @@ async def check_name_availability(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response)
+        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -191,8 +190,8 @@ async def _create_initial(
         account_name: str,
         parameters: Union[_models.StorageAccountCreateParameters, IO[bytes]],
         **kwargs: Any
-    ) -> Optional[_models.StorageAccount]:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -205,7 +204,7 @@ async def _create_initial(
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-10-01"))
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
-        cls: ClsType[Optional[_models.StorageAccount]] = kwargs.pop("cls", None)
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
         _json = None
@@ -226,10 +225,10 @@ async def _create_initial(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -237,12 +236,14 @@ async def _create_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = None
-        if response.status_code == 200:
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -368,10 +369,11 @@ async def begin_create(
                 params=_params,
                 **kwargs
             )
+            await raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+            deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
             if cls:
                 return cls(pipeline_response, deserialized, {})  # type: ignore
             return deserialized
@@ -394,9 +396,7 @@ def get_long_running_output(pipeline_response):
         )
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, **kwargs: Any
-    ) -> None:
+    async def delete(self, resource_group_name: str, account_name: str, **kwargs: Any) -> None:
         """Deletes a storage account in Microsoft Azure.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -410,7 +410,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,
@@ -432,7 +432,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -468,7 +467,7 @@ async def get_properties(
         :rtype: ~azure.mgmt.storage.v2017_10_01.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -490,7 +489,6 @@ async def get_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -504,7 +502,7 @@ async def get_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -615,7 +613,7 @@ async def update(
         :rtype: ~azure.mgmt.storage.v2017_10_01.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -649,7 +647,6 @@ async def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -663,7 +660,7 @@ async def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -686,7 +683,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.StorageAccount"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-10-01"))
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -703,7 +700,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -719,7 +715,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -769,7 +764,7 @@ def list_by_resource_group(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-10-01"))
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -787,7 +782,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -803,7 +797,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -849,7 +842,7 @@ async def list_keys(
         :rtype: ~azure.mgmt.storage.v2017_10_01.models.StorageAccountListKeysResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -871,7 +864,6 @@ async def list_keys(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -885,7 +877,7 @@ async def list_keys(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response)
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -978,7 +970,7 @@ async def regenerate_key(
         :rtype: ~azure.mgmt.storage.v2017_10_01.models.StorageAccountListKeysResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1012,7 +1004,6 @@ async def regenerate_key(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1026,7 +1017,7 @@ async def regenerate_key(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response)
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1117,7 +1108,7 @@ async def list_account_sas(
         :rtype: ~azure.mgmt.storage.v2017_10_01.models.ListAccountSasResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1151,7 +1142,6 @@ async def list_account_sas(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1165,7 +1155,7 @@ async def list_account_sas(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListAccountSasResponse", pipeline_response)
+        deserialized = self._deserialize("ListAccountSasResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1254,7 +1244,7 @@ async def list_service_sas(
         :rtype: ~azure.mgmt.storage.v2017_10_01.models.ListServiceSasResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1288,7 +1278,6 @@ async def list_service_sas(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1302,7 +1291,7 @@ async def list_service_sas(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListServiceSasResponse", pipeline_response)
+        deserialized = self._deserialize("ListServiceSasResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/aio/operations/_usage_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/aio/operations/_usage_operations.py
index 82f0b03597f3..41357330f1e4 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/aio/operations/_usage_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/aio/operations/_usage_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
@@ -20,20 +19,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._usage_operations import build_list_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
 
@@ -72,7 +69,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.Usage"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-10-01"))
         cls: ClsType[_models.UsageListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -89,7 +86,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -105,7 +101,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/models/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/models/__init__.py
index facc79b3796a..f56c2d598d3f 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/models/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/models/__init__.py
@@ -5,66 +5,77 @@
 # 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 AccountSasParameters
-from ._models_py3 import CheckNameAvailabilityResult
-from ._models_py3 import CustomDomain
-from ._models_py3 import Dimension
-from ._models_py3 import Encryption
-from ._models_py3 import EncryptionService
-from ._models_py3 import EncryptionServices
-from ._models_py3 import Endpoints
-from ._models_py3 import IPRule
-from ._models_py3 import Identity
-from ._models_py3 import KeyVaultProperties
-from ._models_py3 import ListAccountSasResponse
-from ._models_py3 import ListServiceSasResponse
-from ._models_py3 import MetricSpecification
-from ._models_py3 import NetworkRuleSet
-from ._models_py3 import Operation
-from ._models_py3 import OperationDisplay
-from ._models_py3 import OperationListResult
-from ._models_py3 import Resource
-from ._models_py3 import Restriction
-from ._models_py3 import SKUCapability
-from ._models_py3 import ServiceSasParameters
-from ._models_py3 import ServiceSpecification
-from ._models_py3 import Sku
-from ._models_py3 import StorageAccount
-from ._models_py3 import StorageAccountCheckNameAvailabilityParameters
-from ._models_py3 import StorageAccountCreateParameters
-from ._models_py3 import StorageAccountKey
-from ._models_py3 import StorageAccountListKeysResult
-from ._models_py3 import StorageAccountListResult
-from ._models_py3 import StorageAccountRegenerateKeyParameters
-from ._models_py3 import StorageAccountUpdateParameters
-from ._models_py3 import StorageSkuListResult
-from ._models_py3 import Usage
-from ._models_py3 import UsageListResult
-from ._models_py3 import UsageName
-from ._models_py3 import VirtualNetworkRule
+from typing import TYPE_CHECKING
 
-from ._storage_management_enums import AccessTier
-from ._storage_management_enums import AccountStatus
-from ._storage_management_enums import Bypass
-from ._storage_management_enums import DefaultAction
-from ._storage_management_enums import HttpProtocol
-from ._storage_management_enums import KeyPermission
-from ._storage_management_enums import KeySource
-from ._storage_management_enums import Kind
-from ._storage_management_enums import Permissions
-from ._storage_management_enums import ProvisioningState
-from ._storage_management_enums import Reason
-from ._storage_management_enums import ReasonCode
-from ._storage_management_enums import Services
-from ._storage_management_enums import SignedResource
-from ._storage_management_enums import SignedResourceTypes
-from ._storage_management_enums import SkuName
-from ._storage_management_enums import SkuTier
-from ._storage_management_enums import State
-from ._storage_management_enums import UsageUnit
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+
+from ._models_py3 import (  # type: ignore
+    AccountSasParameters,
+    CheckNameAvailabilityResult,
+    CustomDomain,
+    Dimension,
+    Encryption,
+    EncryptionService,
+    EncryptionServices,
+    Endpoints,
+    IPRule,
+    Identity,
+    KeyVaultProperties,
+    ListAccountSasResponse,
+    ListServiceSasResponse,
+    MetricSpecification,
+    NetworkRuleSet,
+    Operation,
+    OperationDisplay,
+    OperationListResult,
+    Resource,
+    Restriction,
+    SKUCapability,
+    ServiceSasParameters,
+    ServiceSpecification,
+    Sku,
+    StorageAccount,
+    StorageAccountCheckNameAvailabilityParameters,
+    StorageAccountCreateParameters,
+    StorageAccountKey,
+    StorageAccountListKeysResult,
+    StorageAccountListResult,
+    StorageAccountRegenerateKeyParameters,
+    StorageAccountUpdateParameters,
+    StorageSkuListResult,
+    Usage,
+    UsageListResult,
+    UsageName,
+    VirtualNetworkRule,
+)
+
+from ._storage_management_enums import (  # type: ignore
+    AccessTier,
+    AccountStatus,
+    Bypass,
+    DefaultAction,
+    HttpProtocol,
+    KeyPermission,
+    KeySource,
+    Kind,
+    Permissions,
+    ProvisioningState,
+    Reason,
+    ReasonCode,
+    Services,
+    SignedResource,
+    SignedResourceTypes,
+    SkuName,
+    SkuTier,
+    State,
+    UsageUnit,
+)
 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__ = [
@@ -125,5 +136,5 @@
     "State",
     "UsageUnit",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/models/_models_py3.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/models/_models_py3.py
index d4f6532dd4e7..a9c3038971ec 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/models/_models_py3.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/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
 
 
@@ -879,7 +878,7 @@ def __init__(self, *, reason_code: Optional[Union[str, "_models.ReasonCode"]] =
         self.reason_code = reason_code
 
 
-class ServiceSasParameters(_serialization.Model):  # pylint: disable=too-many-instance-attributes
+class ServiceSasParameters(_serialization.Model):
     """The parameters to list service SAS credentials of a specific resource.
 
     All required parameters must be populated in order to send to server.
@@ -1175,7 +1174,7 @@ def __init__(self, **kwargs: Any) -> None:
         self.value = None
 
 
-class StorageAccount(Resource):  # pylint: disable=too-many-instance-attributes
+class StorageAccount(Resource):
     """The storage account.
 
     Variables are only populated by the server, and will be ignored when sending a request.
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/operations/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/operations/__init__.py
index 31ab94a0a14c..82f79dffd3fb 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/operations/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/operations/__init__.py
@@ -5,14 +5,20 @@
 # 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 ._skus_operations import SkusOperations
-from ._storage_accounts_operations import StorageAccountsOperations
-from ._usage_operations import UsageOperations
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._operations import Operations  # type: ignore
+from ._skus_operations import SkusOperations  # type: ignore
+from ._storage_accounts_operations import StorageAccountsOperations  # type: ignore
+from ._usage_operations import UsageOperations  # 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__ = [
@@ -21,5 +27,5 @@
     "StorageAccountsOperations",
     "UsageOperations",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/operations/_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/operations/_operations.py
index f083729b23e6..aa6c8d22805d 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/operations/_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/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 (
@@ -20,20 +19,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -94,7 +91,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.Operation"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-10-01"))
         cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -110,7 +107,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -126,7 +122,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/operations/_skus_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/operations/_skus_operations.py
index 230c0823c1af..5d71b62cf25a 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/operations/_skus_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/operations/_skus_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 (
@@ -20,20 +19,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -99,7 +96,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.Sku"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-10-01"))
         cls: ClsType[_models.StorageSkuListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -116,7 +113,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -132,7 +128,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/operations/_storage_accounts_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/operations/_storage_accounts_operations.py
index d6d0140c364c..98f58ee8403d 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/operations/_storage_accounts_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/operations/_storage_accounts_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,7 @@
 # --------------------------------------------------------------------------
 from io import IOBase
 import sys
-from typing import Any, Callable, Dict, IO, Iterable, 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 (
@@ -17,13 +17,14 @@
     ResourceExistsError,
     ResourceNotFoundError,
     ResourceNotModifiedError,
+    StreamClosedError,
+    StreamConsumedError,
     map_error,
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
 from azure.core.polling import LROPoller, NoPolling, PollingMethod
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
@@ -31,12 +32,11 @@
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -478,7 +478,7 @@ def check_name_availability(
         :rtype: ~azure.mgmt.storage.v2017_10_01.models.CheckNameAvailabilityResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -510,7 +510,6 @@ def check_name_availability(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -524,7 +523,7 @@ def check_name_availability(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response)
+        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -537,8 +536,8 @@ def _create_initial(
         account_name: str,
         parameters: Union[_models.StorageAccountCreateParameters, IO[bytes]],
         **kwargs: Any
-    ) -> Optional[_models.StorageAccount]:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> Iterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -551,7 +550,7 @@ def _create_initial(
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-10-01"))
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
-        cls: ClsType[Optional[_models.StorageAccount]] = kwargs.pop("cls", None)
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
         _json = None
@@ -572,10 +571,10 @@ def _create_initial(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -583,12 +582,14 @@ def _create_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = None
-        if response.status_code == 200:
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -711,10 +712,11 @@ def begin_create(
                 params=_params,
                 **kwargs
             )
+            raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+            deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
             if cls:
                 return cls(pipeline_response, deserialized, {})  # type: ignore
             return deserialized
@@ -753,7 +755,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,
@@ -775,7 +777,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -809,7 +810,7 @@ def get_properties(self, resource_group_name: str, account_name: str, **kwargs:
         :rtype: ~azure.mgmt.storage.v2017_10_01.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -831,7 +832,6 @@ def get_properties(self, resource_group_name: str, account_name: str, **kwargs:
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -845,7 +845,7 @@ def get_properties(self, resource_group_name: str, account_name: str, **kwargs:
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -956,7 +956,7 @@ def update(
         :rtype: ~azure.mgmt.storage.v2017_10_01.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -990,7 +990,6 @@ def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1004,7 +1003,7 @@ def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1026,7 +1025,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.StorageAccount"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-10-01"))
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1043,7 +1042,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -1059,7 +1057,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -1106,7 +1103,7 @@ def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> Ite
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-10-01"))
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1124,7 +1121,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -1140,7 +1136,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -1186,7 +1181,7 @@ def list_keys(
         :rtype: ~azure.mgmt.storage.v2017_10_01.models.StorageAccountListKeysResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1208,7 +1203,6 @@ def list_keys(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1222,7 +1216,7 @@ def list_keys(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response)
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1315,7 +1309,7 @@ def regenerate_key(
         :rtype: ~azure.mgmt.storage.v2017_10_01.models.StorageAccountListKeysResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1349,7 +1343,6 @@ def regenerate_key(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1363,7 +1356,7 @@ def regenerate_key(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response)
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1454,7 +1447,7 @@ def list_account_sas(
         :rtype: ~azure.mgmt.storage.v2017_10_01.models.ListAccountSasResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1488,7 +1481,6 @@ def list_account_sas(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1502,7 +1494,7 @@ def list_account_sas(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListAccountSasResponse", pipeline_response)
+        deserialized = self._deserialize("ListAccountSasResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1591,7 +1583,7 @@ def list_service_sas(
         :rtype: ~azure.mgmt.storage.v2017_10_01.models.ListServiceSasResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1625,7 +1617,6 @@ def list_service_sas(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1639,7 +1630,7 @@ def list_service_sas(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListServiceSasResponse", pipeline_response)
+        deserialized = self._deserialize("ListServiceSasResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/operations/_usage_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/operations/_usage_operations.py
index f2445500601c..cad037dfb31a 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/operations/_usage_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2017_10_01/operations/_usage_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 (
@@ -20,20 +19,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -99,7 +96,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.Usage"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2017-10-01"))
         cls: ClsType[_models.UsageListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -116,7 +113,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -132,7 +128,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/__init__.py
index a860a5c185c9..60980065e1ee 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/__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 ._storage_management_client import StorageManagementClient
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._storage_management_client import StorageManagementClient  # 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__ = [
     "StorageManagementClient",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/_configuration.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/_configuration.py
index a32884e28a53..805962ffc8d5 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/_configuration.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/_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 StorageManagementClientConfiguration:  # pylint: disable=too-many-instance-attributes,name-too-long
+class StorageManagementClientConfiguration:  # pylint: disable=too-many-instance-attributes
     """Configuration for StorageManagementClient.
 
     Note that all parameters used to create this instance are saved as instance
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/_metadata.json b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/_metadata.json
index 0b1ed2583e14..845669689c06 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/_metadata.json
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/_metadata.json
@@ -10,8 +10,8 @@
         "azure_arm": true,
         "has_public_lro_operations": true,
         "client_side_validation": false,
-        "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"ARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementClientConfiguration\"], \".._serialization\": [\"Deserializer\", \"Serializer\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}}",
-        "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"AsyncARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"AsyncARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementClientConfiguration\"], \"..._serialization\": [\"Deserializer\", \"Serializer\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"]}}}"
+        "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"ARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementClientConfiguration\"], \".._serialization\": [\"Deserializer\", \"Serializer\"]}, \"stdlib\": {\"typing_extensions\": [\"Self\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}}",
+        "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"AsyncARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"AsyncARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementClientConfiguration\"], \"..._serialization\": [\"Deserializer\", \"Serializer\"]}, \"stdlib\": {\"typing_extensions\": [\"Self\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"]}}}"
     },
     "global_parameters": {
         "sync": {
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/_storage_management_client.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/_storage_management_client.py
index 012416d187fa..9a2c92531662 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/_storage_management_client.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/_storage_management_client.py
@@ -8,6 +8,7 @@
 
 from copy import deepcopy
 from typing import Any, TYPE_CHECKING
+from typing_extensions import Self
 
 from azure.core.pipeline import policies
 from azure.core.rest import HttpRequest, HttpResponse
@@ -20,11 +21,10 @@
 from .operations import BlobContainersOperations, Operations, SkusOperations, StorageAccountsOperations, UsageOperations
 
 if TYPE_CHECKING:
-    # pylint: disable=unused-import,ungrouped-imports
     from azure.core.credentials import TokenCredential
 
 
-class StorageManagementClient:  # pylint: disable=client-accepts-api-version-keyword
+class StorageManagementClient:
     """The Azure Storage Management API.
 
     :ivar operations: Operations operations
@@ -119,7 +119,7 @@ def _send_request(self, request: HttpRequest, *, stream: bool = False, **kwargs:
     def close(self) -> None:
         self._client.close()
 
-    def __enter__(self) -> "StorageManagementClient":
+    def __enter__(self) -> Self:
         self._client.__enter__()
         return self
 
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/_vendor.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/_vendor.py
deleted file mode 100644
index 0dafe0e287ff..000000000000
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/_vendor.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# --------------------------------------------------------------------------
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License. See License.txt in the project root for license information.
-# Code generated by Microsoft (R) AutoRest Code Generator.
-# Changes may cause incorrect behavior and will be lost if the code is regenerated.
-# --------------------------------------------------------------------------
-
-from azure.core.pipeline.transport import HttpRequest
-
-
-def _convert_request(request, files=None):
-    data = request.content if not files else None
-    request = HttpRequest(method=request.method, url=request.url, headers=request.headers, data=data)
-    if files:
-        request.set_formdata_body(files)
-    return request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/_version.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/_version.py
index 83bf7bbed684..e5754a47ce68 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/_version.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/_version.py
@@ -6,4 +6,4 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-VERSION = "21.2.1"
+VERSION = "1.0.0b1"
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/aio/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/aio/__init__.py
index a5c3d2414cfd..ee2b940bd4fc 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/aio/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/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 ._storage_management_client import StorageManagementClient
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._storage_management_client import StorageManagementClient  # 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__ = [
     "StorageManagementClient",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/aio/_configuration.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/aio/_configuration.py
index ca6b0160974a..476e8ae26aef 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/aio/_configuration.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/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 StorageManagementClientConfiguration:  # pylint: disable=too-many-instance-attributes,name-too-long
+class StorageManagementClientConfiguration:  # pylint: disable=too-many-instance-attributes
     """Configuration for StorageManagementClient.
 
     Note that all parameters used to create this instance are saved as instance
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/aio/_storage_management_client.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/aio/_storage_management_client.py
index e68f0596f59f..d93adf8b0c2f 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/aio/_storage_management_client.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/aio/_storage_management_client.py
@@ -8,6 +8,7 @@
 
 from copy import deepcopy
 from typing import Any, Awaitable, TYPE_CHECKING
+from typing_extensions import Self
 
 from azure.core.pipeline import policies
 from azure.core.rest import AsyncHttpResponse, HttpRequest
@@ -20,11 +21,10 @@
 from .operations import BlobContainersOperations, Operations, SkusOperations, StorageAccountsOperations, UsageOperations
 
 if TYPE_CHECKING:
-    # pylint: disable=unused-import,ungrouped-imports
     from azure.core.credentials_async import AsyncTokenCredential
 
 
-class StorageManagementClient:  # pylint: disable=client-accepts-api-version-keyword
+class StorageManagementClient:
     """The Azure Storage Management API.
 
     :ivar operations: Operations operations
@@ -123,7 +123,7 @@ def _send_request(
     async def close(self) -> None:
         await self._client.close()
 
-    async def __aenter__(self) -> "StorageManagementClient":
+    async def __aenter__(self) -> Self:
         await self._client.__aenter__()
         return self
 
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/aio/operations/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/aio/operations/__init__.py
index abe747aa8c96..75b3760133ed 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/aio/operations/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/aio/operations/__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 ._operations import Operations
-from ._skus_operations import SkusOperations
-from ._storage_accounts_operations import StorageAccountsOperations
-from ._usage_operations import UsageOperations
-from ._blob_containers_operations import BlobContainersOperations
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._operations import Operations  # type: ignore
+from ._skus_operations import SkusOperations  # type: ignore
+from ._storage_accounts_operations import StorageAccountsOperations  # type: ignore
+from ._usage_operations import UsageOperations  # type: ignore
+from ._blob_containers_operations import BlobContainersOperations  # 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__ = [
@@ -23,5 +29,5 @@
     "UsageOperations",
     "BlobContainersOperations",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/aio/operations/_blob_containers_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/aio/operations/_blob_containers_operations.py
index 4c288996f15d..5075ed4c0db0 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/aio/operations/_blob_containers_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/aio/operations/_blob_containers_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,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,
@@ -19,14 +19,12 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._blob_containers_operations import (
     build_clear_legal_hold_request,
     build_create_or_update_immutability_policy_request,
@@ -46,7 +44,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]]
 
@@ -87,7 +85,7 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
         :rtype: ~azure.mgmt.storage.v2018_02_01.models.ListContainerItems
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -109,7 +107,6 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -123,7 +120,7 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListContainerItems", pipeline_response)
+        deserialized = self._deserialize("ListContainerItems", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -236,7 +233,7 @@ async def create(
         :rtype: ~azure.mgmt.storage.v2018_02_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -271,7 +268,6 @@ async def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -285,7 +281,7 @@ async def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -395,7 +391,7 @@ async def update(
         :rtype: ~azure.mgmt.storage.v2018_02_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -430,7 +426,6 @@ async def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -444,7 +439,7 @@ async def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -473,7 +468,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2018_02_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -496,7 +491,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -510,7 +504,7 @@ async def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -518,9 +512,7 @@ async def get(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, container_name: str, **kwargs: Any
-    ) -> None:
+    async def delete(self, resource_group_name: str, account_name: str, container_name: str, **kwargs: Any) -> None:
         """Deletes specified container under its account.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -539,7 +531,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,
@@ -562,7 +554,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -685,7 +676,7 @@ async def set_legal_hold(
         :rtype: ~azure.mgmt.storage.v2018_02_01.models.LegalHold
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -720,7 +711,6 @@ async def set_legal_hold(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -734,7 +724,7 @@ async def set_legal_hold(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LegalHold", pipeline_response)
+        deserialized = self._deserialize("LegalHold", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -844,7 +834,7 @@ async def clear_legal_hold(
         :rtype: ~azure.mgmt.storage.v2018_02_01.models.LegalHold
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -879,7 +869,6 @@ async def clear_legal_hold(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -893,7 +882,7 @@ async def clear_legal_hold(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LegalHold", pipeline_response)
+        deserialized = self._deserialize("LegalHold", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1032,7 +1021,7 @@ async def create_or_update_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2018_02_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1072,7 +1061,6 @@ async def create_or_update_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1089,7 +1077,7 @@ async def create_or_update_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1132,7 +1120,7 @@ async def get_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2018_02_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1157,7 +1145,6 @@ async def get_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1174,7 +1161,7 @@ async def get_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1219,7 +1206,7 @@ async def delete_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2018_02_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1244,7 +1231,6 @@ async def delete_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1261,7 +1247,7 @@ async def delete_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1295,7 +1281,7 @@ async def lock_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2018_02_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1319,7 +1305,6 @@ async def lock_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1336,7 +1321,7 @@ async def lock_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1466,7 +1451,7 @@ async def extend_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2018_02_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1505,7 +1490,6 @@ async def extend_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1522,7 +1506,7 @@ async def extend_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1632,7 +1616,7 @@ async def lease(
         :rtype: ~azure.mgmt.storage.v2018_02_01.models.LeaseContainerResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1670,7 +1654,6 @@ async def lease(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1684,7 +1667,7 @@ async def lease(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LeaseContainerResponse", pipeline_response)
+        deserialized = self._deserialize("LeaseContainerResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/aio/operations/_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/aio/operations/_operations.py
index 4b9f60bd2d31..8ab5631ea141 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/aio/operations/_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/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
@@ -20,20 +19,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._operations import build_list_request
 
 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]]
 
@@ -73,7 +70,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.Operation"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-02-01"))
         cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -89,7 +86,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -105,7 +101,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/aio/operations/_skus_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/aio/operations/_skus_operations.py
index f3a499e5ee7e..eb14707d9a52 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/aio/operations/_skus_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/aio/operations/_skus_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
@@ -20,20 +19,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._skus_operations import build_list_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
 
@@ -72,7 +69,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.Sku"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-02-01"))
         cls: ClsType[_models.StorageSkuListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -89,7 +86,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -105,7 +101,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/aio/operations/_storage_accounts_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/aio/operations/_storage_accounts_operations.py
index 4374c44dffd1..8d4dd7fa4836 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/aio/operations/_storage_accounts_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/aio/operations/_storage_accounts_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,7 @@
 # --------------------------------------------------------------------------
 from io import IOBase
 import sys
-from typing import Any, AsyncIterable, 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
@@ -18,12 +18,13 @@
     ResourceExistsError,
     ResourceNotFoundError,
     ResourceNotModifiedError,
+    StreamClosedError,
+    StreamConsumedError,
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
 from azure.core.polling import AsyncLROPoller, AsyncNoPolling, AsyncPollingMethod
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
@@ -31,7 +32,6 @@
 from azure.mgmt.core.polling.async_arm_polling import AsyncARMPolling
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._storage_accounts_operations import (
     build_check_name_availability_request,
     build_create_request,
@@ -49,7 +49,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]]
 
@@ -132,7 +132,7 @@ async def check_name_availability(
         :rtype: ~azure.mgmt.storage.v2018_02_01.models.CheckNameAvailabilityResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -164,7 +164,6 @@ async def check_name_availability(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -178,7 +177,7 @@ async def check_name_availability(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response)
+        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -191,8 +190,8 @@ async def _create_initial(
         account_name: str,
         parameters: Union[_models.StorageAccountCreateParameters, IO[bytes]],
         **kwargs: Any
-    ) -> Optional[_models.StorageAccount]:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -205,7 +204,7 @@ async def _create_initial(
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-02-01"))
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
-        cls: ClsType[Optional[_models.StorageAccount]] = kwargs.pop("cls", None)
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
         _json = None
@@ -226,10 +225,10 @@ async def _create_initial(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -237,12 +236,14 @@ async def _create_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = None
-        if response.status_code == 200:
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -368,10 +369,11 @@ async def begin_create(
                 params=_params,
                 **kwargs
             )
+            await raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+            deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
             if cls:
                 return cls(pipeline_response, deserialized, {})  # type: ignore
             return deserialized
@@ -394,9 +396,7 @@ def get_long_running_output(pipeline_response):
         )
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, **kwargs: Any
-    ) -> None:
+    async def delete(self, resource_group_name: str, account_name: str, **kwargs: Any) -> None:
         """Deletes a storage account in Microsoft Azure.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -410,7 +410,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,
@@ -432,7 +432,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -468,7 +467,7 @@ async def get_properties(
         :rtype: ~azure.mgmt.storage.v2018_02_01.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -490,7 +489,6 @@ async def get_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -504,7 +502,7 @@ async def get_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -615,7 +613,7 @@ async def update(
         :rtype: ~azure.mgmt.storage.v2018_02_01.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -649,7 +647,6 @@ async def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -663,7 +660,7 @@ async def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -686,7 +683,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.StorageAccount"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-02-01"))
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -703,7 +700,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -719,7 +715,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -769,7 +764,7 @@ def list_by_resource_group(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-02-01"))
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -787,7 +782,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -803,7 +797,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -849,7 +842,7 @@ async def list_keys(
         :rtype: ~azure.mgmt.storage.v2018_02_01.models.StorageAccountListKeysResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -871,7 +864,6 @@ async def list_keys(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -885,7 +877,7 @@ async def list_keys(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response)
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -978,7 +970,7 @@ async def regenerate_key(
         :rtype: ~azure.mgmt.storage.v2018_02_01.models.StorageAccountListKeysResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1012,7 +1004,6 @@ async def regenerate_key(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1026,7 +1017,7 @@ async def regenerate_key(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response)
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1117,7 +1108,7 @@ async def list_account_sas(
         :rtype: ~azure.mgmt.storage.v2018_02_01.models.ListAccountSasResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1151,7 +1142,6 @@ async def list_account_sas(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1165,7 +1155,7 @@ async def list_account_sas(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListAccountSasResponse", pipeline_response)
+        deserialized = self._deserialize("ListAccountSasResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1254,7 +1244,7 @@ async def list_service_sas(
         :rtype: ~azure.mgmt.storage.v2018_02_01.models.ListServiceSasResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1288,7 +1278,6 @@ async def list_service_sas(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1302,7 +1291,7 @@ async def list_service_sas(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListServiceSasResponse", pipeline_response)
+        deserialized = self._deserialize("ListServiceSasResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/aio/operations/_usage_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/aio/operations/_usage_operations.py
index 778f859d29d6..5e362335e9e5 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/aio/operations/_usage_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/aio/operations/_usage_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
@@ -20,20 +19,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._usage_operations import build_list_by_location_request, build_list_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
 
@@ -72,7 +69,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.Usage"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-02-01"))
         cls: ClsType[_models.UsageListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -89,7 +86,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -105,7 +101,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -151,7 +146,7 @@ def list_by_location(self, location: str, **kwargs: Any) -> AsyncIterable["_mode
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-02-01"))
         cls: ClsType[_models.UsageListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -169,7 +164,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -185,7 +179,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/models/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/models/__init__.py
index e3075feed5ec..8308de22c941 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/models/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/models/__init__.py
@@ -5,87 +5,98 @@
 # 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 AccountSasParameters
-from ._models_py3 import AzureEntityResource
-from ._models_py3 import BlobContainer
-from ._models_py3 import CheckNameAvailabilityResult
-from ._models_py3 import CustomDomain
-from ._models_py3 import Dimension
-from ._models_py3 import Encryption
-from ._models_py3 import EncryptionService
-from ._models_py3 import EncryptionServices
-from ._models_py3 import Endpoints
-from ._models_py3 import IPRule
-from ._models_py3 import Identity
-from ._models_py3 import ImmutabilityPolicy
-from ._models_py3 import ImmutabilityPolicyProperties
-from ._models_py3 import KeyVaultProperties
-from ._models_py3 import LeaseContainerRequest
-from ._models_py3 import LeaseContainerResponse
-from ._models_py3 import LegalHold
-from ._models_py3 import LegalHoldProperties
-from ._models_py3 import ListAccountSasResponse
-from ._models_py3 import ListContainerItem
-from ._models_py3 import ListContainerItems
-from ._models_py3 import ListServiceSasResponse
-from ._models_py3 import MetricSpecification
-from ._models_py3 import NetworkRuleSet
-from ._models_py3 import Operation
-from ._models_py3 import OperationDisplay
-from ._models_py3 import OperationListResult
-from ._models_py3 import Resource
-from ._models_py3 import Restriction
-from ._models_py3 import SKUCapability
-from ._models_py3 import ServiceSasParameters
-from ._models_py3 import ServiceSpecification
-from ._models_py3 import Sku
-from ._models_py3 import StorageAccount
-from ._models_py3 import StorageAccountCheckNameAvailabilityParameters
-from ._models_py3 import StorageAccountCreateParameters
-from ._models_py3 import StorageAccountKey
-from ._models_py3 import StorageAccountListKeysResult
-from ._models_py3 import StorageAccountListResult
-from ._models_py3 import StorageAccountRegenerateKeyParameters
-from ._models_py3 import StorageAccountUpdateParameters
-from ._models_py3 import StorageSkuListResult
-from ._models_py3 import TagProperty
-from ._models_py3 import TrackedResource
-from ._models_py3 import UpdateHistoryProperty
-from ._models_py3 import Usage
-from ._models_py3 import UsageListResult
-from ._models_py3 import UsageName
-from ._models_py3 import VirtualNetworkRule
+from typing import TYPE_CHECKING
 
-from ._storage_management_client_enums import AccessTier
-from ._storage_management_client_enums import AccountStatus
-from ._storage_management_client_enums import Bypass
-from ._storage_management_client_enums import DefaultAction
-from ._storage_management_client_enums import Enum12
-from ._storage_management_client_enums import HttpProtocol
-from ._storage_management_client_enums import ImmutabilityPolicyState
-from ._storage_management_client_enums import ImmutabilityPolicyUpdateType
-from ._storage_management_client_enums import KeyPermission
-from ._storage_management_client_enums import KeySource
-from ._storage_management_client_enums import Kind
-from ._storage_management_client_enums import LeaseContainerRequestAction
-from ._storage_management_client_enums import LeaseDuration
-from ._storage_management_client_enums import LeaseState
-from ._storage_management_client_enums import LeaseStatus
-from ._storage_management_client_enums import Permissions
-from ._storage_management_client_enums import ProvisioningState
-from ._storage_management_client_enums import PublicAccess
-from ._storage_management_client_enums import Reason
-from ._storage_management_client_enums import ReasonCode
-from ._storage_management_client_enums import Services
-from ._storage_management_client_enums import SignedResource
-from ._storage_management_client_enums import SignedResourceTypes
-from ._storage_management_client_enums import SkuName
-from ._storage_management_client_enums import SkuTier
-from ._storage_management_client_enums import State
-from ._storage_management_client_enums import UsageUnit
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+
+from ._models_py3 import (  # type: ignore
+    AccountSasParameters,
+    AzureEntityResource,
+    BlobContainer,
+    CheckNameAvailabilityResult,
+    CustomDomain,
+    Dimension,
+    Encryption,
+    EncryptionService,
+    EncryptionServices,
+    Endpoints,
+    IPRule,
+    Identity,
+    ImmutabilityPolicy,
+    ImmutabilityPolicyProperties,
+    KeyVaultProperties,
+    LeaseContainerRequest,
+    LeaseContainerResponse,
+    LegalHold,
+    LegalHoldProperties,
+    ListAccountSasResponse,
+    ListContainerItem,
+    ListContainerItems,
+    ListServiceSasResponse,
+    MetricSpecification,
+    NetworkRuleSet,
+    Operation,
+    OperationDisplay,
+    OperationListResult,
+    Resource,
+    Restriction,
+    SKUCapability,
+    ServiceSasParameters,
+    ServiceSpecification,
+    Sku,
+    StorageAccount,
+    StorageAccountCheckNameAvailabilityParameters,
+    StorageAccountCreateParameters,
+    StorageAccountKey,
+    StorageAccountListKeysResult,
+    StorageAccountListResult,
+    StorageAccountRegenerateKeyParameters,
+    StorageAccountUpdateParameters,
+    StorageSkuListResult,
+    TagProperty,
+    TrackedResource,
+    UpdateHistoryProperty,
+    Usage,
+    UsageListResult,
+    UsageName,
+    VirtualNetworkRule,
+)
+
+from ._storage_management_client_enums import (  # type: ignore
+    AccessTier,
+    AccountStatus,
+    Bypass,
+    DefaultAction,
+    Enum12,
+    HttpProtocol,
+    ImmutabilityPolicyState,
+    ImmutabilityPolicyUpdateType,
+    KeyPermission,
+    KeySource,
+    Kind,
+    LeaseContainerRequestAction,
+    LeaseDuration,
+    LeaseState,
+    LeaseStatus,
+    Permissions,
+    ProvisioningState,
+    PublicAccess,
+    Reason,
+    ReasonCode,
+    Services,
+    SignedResource,
+    SignedResourceTypes,
+    SkuName,
+    SkuTier,
+    State,
+    UsageUnit,
+)
 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__ = [
@@ -167,5 +178,5 @@
     "State",
     "UsageUnit",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/models/_models_py3.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/models/_models_py3.py
index 2ce6bcde5fb9..45b00f1c2ca6 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/models/_models_py3.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/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
 
 
@@ -191,7 +190,7 @@ def __init__(self, **kwargs: Any) -> None:
         self.etag = None
 
 
-class BlobContainer(AzureEntityResource):  # pylint: disable=too-many-instance-attributes
+class BlobContainer(AzureEntityResource):
     """Properties of the blob container, including Id, resource name, resource type, Etag.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -794,7 +793,7 @@ class LeaseContainerRequest(_serialization.Model):
     All required parameters must be populated in order to send to server.
 
     :ivar action: Specifies the lease action. Can be one of the available actions. Required. Known
-     values are: "Acquire", "Renew", "Change", "Release", and "Break".
+     values are: "Acquire", "Renew", "Change", "Release", "Break", and "Break".
     :vartype action: str or ~azure.mgmt.storage.v2018_02_01.models.LeaseContainerRequestAction
     :ivar lease_id: Identifies the lease. Can be specified in any valid GUID string format.
     :vartype lease_id: str
@@ -833,7 +832,7 @@ def __init__(
     ) -> None:
         """
         :keyword action: Specifies the lease action. Can be one of the available actions. Required.
-         Known values are: "Acquire", "Renew", "Change", "Release", and "Break".
+         Known values are: "Acquire", "Renew", "Change", "Release", "Break", and "Break".
         :paramtype action: str or ~azure.mgmt.storage.v2018_02_01.models.LeaseContainerRequestAction
         :keyword lease_id: Identifies the lease. Can be specified in any valid GUID string format.
         :paramtype lease_id: str
@@ -979,7 +978,7 @@ def __init__(self, **kwargs: Any) -> None:
         self.account_sas_token = None
 
 
-class ListContainerItem(AzureEntityResource):  # pylint: disable=too-many-instance-attributes
+class ListContainerItem(AzureEntityResource):
     """The blob container properties be listed out.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -1425,7 +1424,7 @@ def __init__(self, *, reason_code: Optional[Union[str, "_models.ReasonCode"]] =
         self.reason_code = reason_code
 
 
-class ServiceSasParameters(_serialization.Model):  # pylint: disable=too-many-instance-attributes
+class ServiceSasParameters(_serialization.Model):
     """The parameters to list service SAS credentials of a specific resource.
 
     All required parameters must be populated in order to send to server.
@@ -1768,7 +1767,7 @@ def __init__(self, *, location: str, tags: Optional[Dict[str, str]] = None, **kw
         self.location = location
 
 
-class StorageAccount(TrackedResource):  # pylint: disable=too-many-instance-attributes
+class StorageAccount(TrackedResource):
     """The storage account.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -1966,7 +1965,7 @@ def __init__(self, *, name: str, **kwargs: Any) -> None:
         self.name = name
 
 
-class StorageAccountCreateParameters(_serialization.Model):  # pylint: disable=too-many-instance-attributes
+class StorageAccountCreateParameters(_serialization.Model):
     """The parameters used when creating a storage account.
 
     All required parameters must be populated in order to send to server.
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/models/_storage_management_client_enums.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/models/_storage_management_client_enums.py
index 8ef62cd2100f..63b3d0d7b870 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/models/_storage_management_client_enums.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/models/_storage_management_client_enums.py
@@ -106,6 +106,7 @@ class LeaseContainerRequestAction(str, Enum, metaclass=CaseInsensitiveEnumMeta):
     RENEW = "Renew"
     CHANGE = "Change"
     RELEASE = "Release"
+    BREAK = "Break"
     BREAK_ENUM = "Break"
 
 
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/operations/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/operations/__init__.py
index abe747aa8c96..75b3760133ed 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/operations/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/operations/__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 ._operations import Operations
-from ._skus_operations import SkusOperations
-from ._storage_accounts_operations import StorageAccountsOperations
-from ._usage_operations import UsageOperations
-from ._blob_containers_operations import BlobContainersOperations
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._operations import Operations  # type: ignore
+from ._skus_operations import SkusOperations  # type: ignore
+from ._storage_accounts_operations import StorageAccountsOperations  # type: ignore
+from ._usage_operations import UsageOperations  # type: ignore
+from ._blob_containers_operations import BlobContainersOperations  # 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__ = [
@@ -23,5 +29,5 @@
     "UsageOperations",
     "BlobContainersOperations",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/operations/_blob_containers_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/operations/_blob_containers_operations.py
index b4164e4d9bfd..88299f7715f7 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/operations/_blob_containers_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/operations/_blob_containers_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,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,
@@ -19,20 +19,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -573,7 +571,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
         :rtype: ~azure.mgmt.storage.v2018_02_01.models.ListContainerItems
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -595,7 +593,6 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -609,7 +606,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListContainerItems", pipeline_response)
+        deserialized = self._deserialize("ListContainerItems", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -722,7 +719,7 @@ def create(
         :rtype: ~azure.mgmt.storage.v2018_02_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -757,7 +754,6 @@ def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -771,7 +767,7 @@ def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -881,7 +877,7 @@ def update(
         :rtype: ~azure.mgmt.storage.v2018_02_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -916,7 +912,6 @@ def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -930,7 +925,7 @@ def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -959,7 +954,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2018_02_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -982,7 +977,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -996,7 +990,7 @@ def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1025,7 +1019,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,
@@ -1048,7 +1042,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1171,7 +1164,7 @@ def set_legal_hold(
         :rtype: ~azure.mgmt.storage.v2018_02_01.models.LegalHold
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1206,7 +1199,6 @@ def set_legal_hold(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1220,7 +1212,7 @@ def set_legal_hold(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LegalHold", pipeline_response)
+        deserialized = self._deserialize("LegalHold", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1330,7 +1322,7 @@ def clear_legal_hold(
         :rtype: ~azure.mgmt.storage.v2018_02_01.models.LegalHold
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1365,7 +1357,6 @@ def clear_legal_hold(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1379,7 +1370,7 @@ def clear_legal_hold(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LegalHold", pipeline_response)
+        deserialized = self._deserialize("LegalHold", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1518,7 +1509,7 @@ def create_or_update_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2018_02_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1558,7 +1549,6 @@ def create_or_update_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1575,7 +1565,7 @@ def create_or_update_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1618,7 +1608,7 @@ def get_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2018_02_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1643,7 +1633,6 @@ def get_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1660,7 +1649,7 @@ def get_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1705,7 +1694,7 @@ def delete_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2018_02_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1730,7 +1719,6 @@ def delete_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1747,7 +1735,7 @@ def delete_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1781,7 +1769,7 @@ def lock_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2018_02_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1805,7 +1793,6 @@ def lock_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1822,7 +1809,7 @@ def lock_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1952,7 +1939,7 @@ def extend_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2018_02_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1991,7 +1978,6 @@ def extend_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -2008,7 +1994,7 @@ def extend_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -2118,7 +2104,7 @@ def lease(
         :rtype: ~azure.mgmt.storage.v2018_02_01.models.LeaseContainerResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -2156,7 +2142,6 @@ def lease(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -2170,7 +2155,7 @@ def lease(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LeaseContainerResponse", pipeline_response)
+        deserialized = self._deserialize("LeaseContainerResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/operations/_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/operations/_operations.py
index 2aaa9ffd0c59..8518c6073d36 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/operations/_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/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 (
@@ -20,20 +19,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -94,7 +91,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.Operation"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-02-01"))
         cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -110,7 +107,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -126,7 +122,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/operations/_skus_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/operations/_skus_operations.py
index 5640f4fb58c0..40fbb7f78e6a 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/operations/_skus_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/operations/_skus_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 (
@@ -20,20 +19,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -99,7 +96,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.Sku"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-02-01"))
         cls: ClsType[_models.StorageSkuListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -116,7 +113,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -132,7 +128,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/operations/_storage_accounts_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/operations/_storage_accounts_operations.py
index 8095a41ba83c..484179b75667 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/operations/_storage_accounts_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/operations/_storage_accounts_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,7 @@
 # --------------------------------------------------------------------------
 from io import IOBase
 import sys
-from typing import Any, Callable, Dict, IO, Iterable, 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 (
@@ -17,13 +17,14 @@
     ResourceExistsError,
     ResourceNotFoundError,
     ResourceNotModifiedError,
+    StreamClosedError,
+    StreamConsumedError,
     map_error,
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
 from azure.core.polling import LROPoller, NoPolling, PollingMethod
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
@@ -31,12 +32,11 @@
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -478,7 +478,7 @@ def check_name_availability(
         :rtype: ~azure.mgmt.storage.v2018_02_01.models.CheckNameAvailabilityResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -510,7 +510,6 @@ def check_name_availability(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -524,7 +523,7 @@ def check_name_availability(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response)
+        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -537,8 +536,8 @@ def _create_initial(
         account_name: str,
         parameters: Union[_models.StorageAccountCreateParameters, IO[bytes]],
         **kwargs: Any
-    ) -> Optional[_models.StorageAccount]:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> Iterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -551,7 +550,7 @@ def _create_initial(
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-02-01"))
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
-        cls: ClsType[Optional[_models.StorageAccount]] = kwargs.pop("cls", None)
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
         _json = None
@@ -572,10 +571,10 @@ def _create_initial(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -583,12 +582,14 @@ def _create_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = None
-        if response.status_code == 200:
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -711,10 +712,11 @@ def begin_create(
                 params=_params,
                 **kwargs
             )
+            raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+            deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
             if cls:
                 return cls(pipeline_response, deserialized, {})  # type: ignore
             return deserialized
@@ -753,7 +755,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,
@@ -775,7 +777,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -809,7 +810,7 @@ def get_properties(self, resource_group_name: str, account_name: str, **kwargs:
         :rtype: ~azure.mgmt.storage.v2018_02_01.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -831,7 +832,6 @@ def get_properties(self, resource_group_name: str, account_name: str, **kwargs:
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -845,7 +845,7 @@ def get_properties(self, resource_group_name: str, account_name: str, **kwargs:
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -956,7 +956,7 @@ def update(
         :rtype: ~azure.mgmt.storage.v2018_02_01.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -990,7 +990,6 @@ def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1004,7 +1003,7 @@ def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1026,7 +1025,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.StorageAccount"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-02-01"))
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1043,7 +1042,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -1059,7 +1057,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -1106,7 +1103,7 @@ def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> Ite
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-02-01"))
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1124,7 +1121,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -1140,7 +1136,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -1186,7 +1181,7 @@ def list_keys(
         :rtype: ~azure.mgmt.storage.v2018_02_01.models.StorageAccountListKeysResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1208,7 +1203,6 @@ def list_keys(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1222,7 +1216,7 @@ def list_keys(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response)
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1315,7 +1309,7 @@ def regenerate_key(
         :rtype: ~azure.mgmt.storage.v2018_02_01.models.StorageAccountListKeysResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1349,7 +1343,6 @@ def regenerate_key(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1363,7 +1356,7 @@ def regenerate_key(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response)
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1454,7 +1447,7 @@ def list_account_sas(
         :rtype: ~azure.mgmt.storage.v2018_02_01.models.ListAccountSasResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1488,7 +1481,6 @@ def list_account_sas(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1502,7 +1494,7 @@ def list_account_sas(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListAccountSasResponse", pipeline_response)
+        deserialized = self._deserialize("ListAccountSasResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1591,7 +1583,7 @@ def list_service_sas(
         :rtype: ~azure.mgmt.storage.v2018_02_01.models.ListServiceSasResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1625,7 +1617,6 @@ def list_service_sas(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1639,7 +1630,7 @@ def list_service_sas(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListServiceSasResponse", pipeline_response)
+        deserialized = self._deserialize("ListServiceSasResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/operations/_usage_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/operations/_usage_operations.py
index ed94dc23643c..54efe879dd2e 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/operations/_usage_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_02_01/operations/_usage_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 (
@@ -20,20 +19,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -126,7 +123,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.Usage"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-02-01"))
         cls: ClsType[_models.UsageListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -143,7 +140,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -159,7 +155,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -205,7 +200,7 @@ def list_by_location(self, location: str, **kwargs: Any) -> Iterable["_models.Us
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-02-01"))
         cls: ClsType[_models.UsageListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -223,7 +218,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -239,7 +233,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/__init__.py
index a860a5c185c9..60980065e1ee 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/__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 ._storage_management_client import StorageManagementClient
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._storage_management_client import StorageManagementClient  # 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__ = [
     "StorageManagementClient",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/_configuration.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/_configuration.py
index 9c94ede524e1..04b1a33e69e7 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/_configuration.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/_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 StorageManagementClientConfiguration:  # pylint: disable=too-many-instance-attributes,name-too-long
+class StorageManagementClientConfiguration:  # pylint: disable=too-many-instance-attributes
     """Configuration for StorageManagementClient.
 
     Note that all parameters used to create this instance are saved as instance
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/_metadata.json b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/_metadata.json
index d82b92dd9c83..fae3912c18a9 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/_metadata.json
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/_metadata.json
@@ -10,8 +10,8 @@
         "azure_arm": true,
         "has_public_lro_operations": true,
         "client_side_validation": false,
-        "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"ARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementClientConfiguration\"], \".._serialization\": [\"Deserializer\", \"Serializer\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}}",
-        "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"AsyncARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"AsyncARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementClientConfiguration\"], \"..._serialization\": [\"Deserializer\", \"Serializer\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"]}}}"
+        "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"ARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementClientConfiguration\"], \".._serialization\": [\"Deserializer\", \"Serializer\"]}, \"stdlib\": {\"typing_extensions\": [\"Self\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}}",
+        "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"AsyncARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"AsyncARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementClientConfiguration\"], \"..._serialization\": [\"Deserializer\", \"Serializer\"]}, \"stdlib\": {\"typing_extensions\": [\"Self\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"]}}}"
     },
     "global_parameters": {
         "sync": {
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/_storage_management_client.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/_storage_management_client.py
index 98db49918487..c8fa9219779f 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/_storage_management_client.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/_storage_management_client.py
@@ -8,6 +8,7 @@
 
 from copy import deepcopy
 from typing import Any, TYPE_CHECKING
+from typing_extensions import Self
 
 from azure.core.pipeline import policies
 from azure.core.rest import HttpRequest, HttpResponse
@@ -27,11 +28,10 @@
 )
 
 if TYPE_CHECKING:
-    # pylint: disable=unused-import,ungrouped-imports
     from azure.core.credentials import TokenCredential
 
 
-class StorageManagementClient:  # pylint: disable=client-accepts-api-version-keyword
+class StorageManagementClient:
     """The Azure Storage Management API.
 
     :ivar operations: Operations operations
@@ -138,7 +138,7 @@ def _send_request(self, request: HttpRequest, *, stream: bool = False, **kwargs:
     def close(self) -> None:
         self._client.close()
 
-    def __enter__(self) -> "StorageManagementClient":
+    def __enter__(self) -> Self:
         self._client.__enter__()
         return self
 
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/_vendor.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/_vendor.py
deleted file mode 100644
index 0dafe0e287ff..000000000000
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/_vendor.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# --------------------------------------------------------------------------
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License. See License.txt in the project root for license information.
-# Code generated by Microsoft (R) AutoRest Code Generator.
-# Changes may cause incorrect behavior and will be lost if the code is regenerated.
-# --------------------------------------------------------------------------
-
-from azure.core.pipeline.transport import HttpRequest
-
-
-def _convert_request(request, files=None):
-    data = request.content if not files else None
-    request = HttpRequest(method=request.method, url=request.url, headers=request.headers, data=data)
-    if files:
-        request.set_formdata_body(files)
-    return request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/_version.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/_version.py
index 83bf7bbed684..e5754a47ce68 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/_version.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/_version.py
@@ -6,4 +6,4 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-VERSION = "21.2.1"
+VERSION = "1.0.0b1"
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/aio/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/aio/__init__.py
index a5c3d2414cfd..ee2b940bd4fc 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/aio/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/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 ._storage_management_client import StorageManagementClient
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._storage_management_client import StorageManagementClient  # 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__ = [
     "StorageManagementClient",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/aio/_configuration.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/aio/_configuration.py
index 43c808293f5d..02f3c47ba57f 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/aio/_configuration.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/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 StorageManagementClientConfiguration:  # pylint: disable=too-many-instance-attributes,name-too-long
+class StorageManagementClientConfiguration:  # pylint: disable=too-many-instance-attributes
     """Configuration for StorageManagementClient.
 
     Note that all parameters used to create this instance are saved as instance
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/aio/_storage_management_client.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/aio/_storage_management_client.py
index 203d5689a2d4..660c3caa08d5 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/aio/_storage_management_client.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/aio/_storage_management_client.py
@@ -8,6 +8,7 @@
 
 from copy import deepcopy
 from typing import Any, Awaitable, TYPE_CHECKING
+from typing_extensions import Self
 
 from azure.core.pipeline import policies
 from azure.core.rest import AsyncHttpResponse, HttpRequest
@@ -27,11 +28,10 @@
 )
 
 if TYPE_CHECKING:
-    # pylint: disable=unused-import,ungrouped-imports
     from azure.core.credentials_async import AsyncTokenCredential
 
 
-class StorageManagementClient:  # pylint: disable=client-accepts-api-version-keyword
+class StorageManagementClient:
     """The Azure Storage Management API.
 
     :ivar operations: Operations operations
@@ -140,7 +140,7 @@ def _send_request(
     async def close(self) -> None:
         await self._client.close()
 
-    async def __aenter__(self) -> "StorageManagementClient":
+    async def __aenter__(self) -> Self:
         await self._client.__aenter__()
         return self
 
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/aio/operations/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/aio/operations/__init__.py
index f701c9204162..20a9703954a4 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/aio/operations/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/aio/operations/__init__.py
@@ -5,16 +5,22 @@
 # Code generated by Microsoft (R) AutoRest Code Generator.
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
+# pylint: disable=wrong-import-position
 
-from ._operations import Operations
-from ._skus_operations import SkusOperations
-from ._storage_accounts_operations import StorageAccountsOperations
-from ._usages_operations import UsagesOperations
-from ._blob_containers_operations import BlobContainersOperations
-from ._management_policies_operations import ManagementPoliciesOperations
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._operations import Operations  # type: ignore
+from ._skus_operations import SkusOperations  # type: ignore
+from ._storage_accounts_operations import StorageAccountsOperations  # type: ignore
+from ._usages_operations import UsagesOperations  # type: ignore
+from ._blob_containers_operations import BlobContainersOperations  # type: ignore
+from ._management_policies_operations import ManagementPoliciesOperations  # type: ignore
 
 from ._patch import __all__ as _patch_all
-from ._patch import *  # pylint: disable=unused-wildcard-import
+from ._patch import *
 from ._patch import patch_sdk as _patch_sdk
 
 __all__ = [
@@ -25,5 +31,5 @@
     "BlobContainersOperations",
     "ManagementPoliciesOperations",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/aio/operations/_blob_containers_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/aio/operations/_blob_containers_operations.py
index d8ef78c498f3..45d87068339c 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/aio/operations/_blob_containers_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/aio/operations/_blob_containers_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,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,
@@ -19,14 +19,12 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._blob_containers_operations import (
     build_clear_legal_hold_request,
     build_create_or_update_immutability_policy_request,
@@ -46,7 +44,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]]
 
@@ -87,7 +85,7 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
         :rtype: ~azure.mgmt.storage.v2018_03_01_preview.models.ListContainerItems
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -111,7 +109,6 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -125,7 +122,7 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListContainerItems", pipeline_response)
+        deserialized = self._deserialize("ListContainerItems", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -238,7 +235,7 @@ async def create(
         :rtype: ~azure.mgmt.storage.v2018_03_01_preview.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -275,7 +272,6 @@ async def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -289,7 +285,7 @@ async def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -399,7 +395,7 @@ async def update(
         :rtype: ~azure.mgmt.storage.v2018_03_01_preview.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -436,7 +432,6 @@ async def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -450,7 +445,7 @@ async def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -479,7 +474,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2018_03_01_preview.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -504,7 +499,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -518,7 +512,7 @@ async def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -526,9 +520,7 @@ async def get(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, container_name: str, **kwargs: Any
-    ) -> None:
+    async def delete(self, resource_group_name: str, account_name: str, container_name: str, **kwargs: Any) -> None:
         """Deletes specified container under its account.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -547,7 +539,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,
@@ -572,7 +564,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -695,7 +686,7 @@ async def set_legal_hold(
         :rtype: ~azure.mgmt.storage.v2018_03_01_preview.models.LegalHold
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -732,7 +723,6 @@ async def set_legal_hold(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -746,7 +736,7 @@ async def set_legal_hold(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LegalHold", pipeline_response)
+        deserialized = self._deserialize("LegalHold", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -856,7 +846,7 @@ async def clear_legal_hold(
         :rtype: ~azure.mgmt.storage.v2018_03_01_preview.models.LegalHold
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -893,7 +883,6 @@ async def clear_legal_hold(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -907,7 +896,7 @@ async def clear_legal_hold(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LegalHold", pipeline_response)
+        deserialized = self._deserialize("LegalHold", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1047,7 +1036,7 @@ async def create_or_update_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2018_03_01_preview.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1089,7 +1078,6 @@ async def create_or_update_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1106,7 +1094,7 @@ async def create_or_update_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1149,7 +1137,7 @@ async def get_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2018_03_01_preview.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1176,7 +1164,6 @@ async def get_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1193,7 +1180,7 @@ async def get_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1238,7 +1225,7 @@ async def delete_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2018_03_01_preview.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1265,7 +1252,6 @@ async def delete_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1282,7 +1268,7 @@ async def delete_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1316,7 +1302,7 @@ async def lock_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2018_03_01_preview.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1342,7 +1328,6 @@ async def lock_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1359,7 +1344,7 @@ async def lock_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1490,7 +1475,7 @@ async def extend_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2018_03_01_preview.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1531,7 +1516,6 @@ async def extend_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1548,7 +1532,7 @@ async def extend_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1659,7 +1643,7 @@ async def lease(
         :rtype: ~azure.mgmt.storage.v2018_03_01_preview.models.LeaseContainerResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1699,7 +1683,6 @@ async def lease(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1713,7 +1696,7 @@ async def lease(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LeaseContainerResponse", pipeline_response)
+        deserialized = self._deserialize("LeaseContainerResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/aio/operations/_management_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/aio/operations/_management_policies_operations.py
index e7ae883d9ff7..57217b3022f7 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/aio/operations/_management_policies_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/aio/operations/_management_policies_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,
@@ -19,14 +18,12 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._management_policies_operations import (
     build_create_or_update_request,
     build_delete_request,
@@ -36,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]]
 
@@ -86,7 +83,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2018_03_01_preview.models.StorageAccountManagementPolicies
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -111,7 +108,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -125,7 +121,7 @@ async def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountManagementPolicies", pipeline_response)
+        deserialized = self._deserialize("StorageAccountManagementPolicies", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -231,7 +227,7 @@ async def create_or_update(
         :rtype: ~azure.mgmt.storage.v2018_03_01_preview.models.StorageAccountManagementPolicies
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -268,7 +264,6 @@ async def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -282,7 +277,7 @@ async def create_or_update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountManagementPolicies", pipeline_response)
+        deserialized = self._deserialize("StorageAccountManagementPolicies", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -290,7 +285,7 @@ async def create_or_update(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
+    async def delete(
         self,
         resource_group_name: str,
         account_name: str,
@@ -314,7 +309,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,
@@ -339,7 +334,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/aio/operations/_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/aio/operations/_operations.py
index 92a62bfb9fe1..1ed0310720d8 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/aio/operations/_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/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
@@ -20,20 +19,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._operations import build_list_request
 
 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 +72,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.Operation"]:
         )
         cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -91,7 +88,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -107,7 +103,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/aio/operations/_skus_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/aio/operations/_skus_operations.py
index 627727bca5db..03aa7f49b857 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/aio/operations/_skus_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/aio/operations/_skus_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
@@ -20,20 +19,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._skus_operations import build_list_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
 
@@ -75,7 +72,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.Sku"]:
         )
         cls: ClsType[_models.StorageSkuListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -92,7 +89,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -108,7 +104,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/aio/operations/_storage_accounts_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/aio/operations/_storage_accounts_operations.py
index 206e5dcdd6ce..3954d594ff10 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/aio/operations/_storage_accounts_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/aio/operations/_storage_accounts_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,7 @@
 # --------------------------------------------------------------------------
 from io import IOBase
 import sys
-from typing import Any, AsyncIterable, 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
@@ -18,12 +18,13 @@
     ResourceExistsError,
     ResourceNotFoundError,
     ResourceNotModifiedError,
+    StreamClosedError,
+    StreamConsumedError,
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
 from azure.core.polling import AsyncLROPoller, AsyncNoPolling, AsyncPollingMethod
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
@@ -31,7 +32,6 @@
 from azure.mgmt.core.polling.async_arm_polling import AsyncARMPolling
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._storage_accounts_operations import (
     build_check_name_availability_request,
     build_create_or_update_management_policies_request,
@@ -52,7 +52,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]]
 
@@ -135,7 +135,7 @@ async def check_name_availability(
         :rtype: ~azure.mgmt.storage.v2018_03_01_preview.models.CheckNameAvailabilityResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -169,7 +169,6 @@ async def check_name_availability(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -183,7 +182,7 @@ async def check_name_availability(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response)
+        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -196,8 +195,8 @@ async def _create_initial(
         account_name: str,
         parameters: Union[_models.StorageAccountCreateParameters, IO[bytes]],
         **kwargs: Any
-    ) -> Optional[_models.StorageAccount]:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -212,7 +211,7 @@ async def _create_initial(
             "api_version", _params.pop("api-version", self._api_version or "2018-03-01-preview")
         )
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
-        cls: ClsType[Optional[_models.StorageAccount]] = kwargs.pop("cls", None)
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
         _json = None
@@ -233,10 +232,10 @@ async def _create_initial(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -244,12 +243,14 @@ async def _create_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = None
-        if response.status_code == 200:
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -377,10 +378,11 @@ async def begin_create(
                 params=_params,
                 **kwargs
             )
+            await raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+            deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
             if cls:
                 return cls(pipeline_response, deserialized, {})  # type: ignore
             return deserialized
@@ -403,9 +405,7 @@ def get_long_running_output(pipeline_response):
         )
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, **kwargs: Any
-    ) -> None:
+    async def delete(self, resource_group_name: str, account_name: str, **kwargs: Any) -> None:
         """Deletes a storage account in Microsoft Azure.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -419,7 +419,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,
@@ -443,7 +443,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -479,7 +478,7 @@ async def get_properties(
         :rtype: ~azure.mgmt.storage.v2018_03_01_preview.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -503,7 +502,6 @@ async def get_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -517,7 +515,7 @@ async def get_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -628,7 +626,7 @@ async def update(
         :rtype: ~azure.mgmt.storage.v2018_03_01_preview.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -664,7 +662,6 @@ async def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -678,7 +675,7 @@ async def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -703,7 +700,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.StorageAccount"]:
         )
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -720,7 +717,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -736,7 +732,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -788,7 +783,7 @@ def list_by_resource_group(
         )
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -806,7 +801,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -822,7 +816,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -868,7 +861,7 @@ async def list_keys(
         :rtype: ~azure.mgmt.storage.v2018_03_01_preview.models.StorageAccountListKeysResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -892,7 +885,6 @@ async def list_keys(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -906,7 +898,7 @@ async def list_keys(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response)
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1000,7 +992,7 @@ async def regenerate_key(
         :rtype: ~azure.mgmt.storage.v2018_03_01_preview.models.StorageAccountListKeysResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1036,7 +1028,6 @@ async def regenerate_key(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1050,7 +1041,7 @@ async def regenerate_key(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response)
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1142,7 +1133,7 @@ async def list_account_sas(
         :rtype: ~azure.mgmt.storage.v2018_03_01_preview.models.ListAccountSasResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1178,7 +1169,6 @@ async def list_account_sas(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1192,7 +1182,7 @@ async def list_account_sas(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListAccountSasResponse", pipeline_response)
+        deserialized = self._deserialize("ListAccountSasResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1282,7 +1272,7 @@ async def list_service_sas(
         :rtype: ~azure.mgmt.storage.v2018_03_01_preview.models.ListServiceSasResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1318,7 +1308,6 @@ async def list_service_sas(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1332,7 +1321,7 @@ async def list_service_sas(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListServiceSasResponse", pipeline_response)
+        deserialized = self._deserialize("ListServiceSasResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1364,7 +1353,7 @@ async def get_management_policies(
         :rtype: ~azure.mgmt.storage.v2018_03_01_preview.models.StorageAccountManagementPolicies
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1389,7 +1378,6 @@ async def get_management_policies(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1403,7 +1391,7 @@ async def get_management_policies(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountManagementPolicies", pipeline_response)
+        deserialized = self._deserialize("StorageAccountManagementPolicies", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1509,7 +1497,7 @@ async def create_or_update_management_policies(
         :rtype: ~azure.mgmt.storage.v2018_03_01_preview.models.StorageAccountManagementPolicies
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1546,7 +1534,6 @@ async def create_or_update_management_policies(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1560,7 +1547,7 @@ async def create_or_update_management_policies(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountManagementPolicies", pipeline_response)
+        deserialized = self._deserialize("StorageAccountManagementPolicies", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1568,7 +1555,7 @@ async def create_or_update_management_policies(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete_management_policies(  # pylint: disable=inconsistent-return-statements
+    async def delete_management_policies(
         self,
         resource_group_name: str,
         account_name: str,
@@ -1592,7 +1579,7 @@ async def delete_management_policies(  # pylint: disable=inconsistent-return-sta
         :rtype: None
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1617,7 +1604,6 @@ async def delete_management_policies(  # pylint: disable=inconsistent-return-sta
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/aio/operations/_usages_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/aio/operations/_usages_operations.py
index 5caa94145772..bf23d585d448 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/aio/operations/_usages_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/aio/operations/_usages_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
@@ -20,20 +19,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._usages_operations import build_list_by_location_request, build_list_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
 
@@ -75,7 +72,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.Usage"]:
         )
         cls: ClsType[_models.UsageListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -92,7 +89,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -108,7 +104,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -157,7 +152,7 @@ def list_by_location(self, location: str, **kwargs: Any) -> AsyncIterable["_mode
         )
         cls: ClsType[_models.UsageListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -175,7 +170,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -191,7 +185,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/models/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/models/__init__.py
index 85e8f71e5eaa..267308b261f2 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/models/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/models/__init__.py
@@ -5,92 +5,103 @@
 # 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 AccountSasParameters
-from ._models_py3 import AzureEntityResource
-from ._models_py3 import BlobContainer
-from ._models_py3 import CheckNameAvailabilityResult
-from ._models_py3 import CustomDomain
-from ._models_py3 import Dimension
-from ._models_py3 import Encryption
-from ._models_py3 import EncryptionService
-from ._models_py3 import EncryptionServices
-from ._models_py3 import Endpoints
-from ._models_py3 import IPRule
-from ._models_py3 import Identity
-from ._models_py3 import ImmutabilityPolicy
-from ._models_py3 import ImmutabilityPolicyProperties
-from ._models_py3 import KeyVaultProperties
-from ._models_py3 import LeaseContainerRequest
-from ._models_py3 import LeaseContainerResponse
-from ._models_py3 import LegalHold
-from ._models_py3 import LegalHoldProperties
-from ._models_py3 import ListAccountSasResponse
-from ._models_py3 import ListContainerItem
-from ._models_py3 import ListContainerItems
-from ._models_py3 import ListServiceSasResponse
-from ._models_py3 import ManagementPoliciesRules
-from ._models_py3 import ManagementPoliciesRulesSetParameter
-from ._models_py3 import MetricSpecification
-from ._models_py3 import NetworkRuleSet
-from ._models_py3 import Operation
-from ._models_py3 import OperationDisplay
-from ._models_py3 import OperationListResult
-from ._models_py3 import Resource
-from ._models_py3 import Restriction
-from ._models_py3 import SKUCapability
-from ._models_py3 import ServiceSasParameters
-from ._models_py3 import ServiceSpecification
-from ._models_py3 import Sku
-from ._models_py3 import StorageAccount
-from ._models_py3 import StorageAccountCheckNameAvailabilityParameters
-from ._models_py3 import StorageAccountCreateParameters
-from ._models_py3 import StorageAccountKey
-from ._models_py3 import StorageAccountListKeysResult
-from ._models_py3 import StorageAccountListResult
-from ._models_py3 import StorageAccountManagementPolicies
-from ._models_py3 import StorageAccountManagementPoliciesRulesProperty
-from ._models_py3 import StorageAccountRegenerateKeyParameters
-from ._models_py3 import StorageAccountUpdateParameters
-from ._models_py3 import StorageSkuListResult
-from ._models_py3 import TagProperty
-from ._models_py3 import TrackedResource
-from ._models_py3 import UpdateHistoryProperty
-from ._models_py3 import Usage
-from ._models_py3 import UsageListResult
-from ._models_py3 import UsageName
-from ._models_py3 import VirtualNetworkRule
+from typing import TYPE_CHECKING
 
-from ._storage_management_client_enums import AccessTier
-from ._storage_management_client_enums import AccountStatus
-from ._storage_management_client_enums import Bypass
-from ._storage_management_client_enums import DefaultAction
-from ._storage_management_client_enums import Enum13
-from ._storage_management_client_enums import HttpProtocol
-from ._storage_management_client_enums import ImmutabilityPolicyState
-from ._storage_management_client_enums import ImmutabilityPolicyUpdateType
-from ._storage_management_client_enums import KeyPermission
-from ._storage_management_client_enums import KeySource
-from ._storage_management_client_enums import Kind
-from ._storage_management_client_enums import LeaseContainerRequestAction
-from ._storage_management_client_enums import LeaseDuration
-from ._storage_management_client_enums import LeaseState
-from ._storage_management_client_enums import LeaseStatus
-from ._storage_management_client_enums import ManagementPolicyName
-from ._storage_management_client_enums import Permissions
-from ._storage_management_client_enums import ProvisioningState
-from ._storage_management_client_enums import PublicAccess
-from ._storage_management_client_enums import Reason
-from ._storage_management_client_enums import ReasonCode
-from ._storage_management_client_enums import Services
-from ._storage_management_client_enums import SignedResource
-from ._storage_management_client_enums import SignedResourceTypes
-from ._storage_management_client_enums import SkuName
-from ._storage_management_client_enums import SkuTier
-from ._storage_management_client_enums import State
-from ._storage_management_client_enums import UsageUnit
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+
+from ._models_py3 import (  # type: ignore
+    AccountSasParameters,
+    AzureEntityResource,
+    BlobContainer,
+    CheckNameAvailabilityResult,
+    CustomDomain,
+    Dimension,
+    Encryption,
+    EncryptionService,
+    EncryptionServices,
+    Endpoints,
+    IPRule,
+    Identity,
+    ImmutabilityPolicy,
+    ImmutabilityPolicyProperties,
+    KeyVaultProperties,
+    LeaseContainerRequest,
+    LeaseContainerResponse,
+    LegalHold,
+    LegalHoldProperties,
+    ListAccountSasResponse,
+    ListContainerItem,
+    ListContainerItems,
+    ListServiceSasResponse,
+    ManagementPoliciesRules,
+    ManagementPoliciesRulesSetParameter,
+    MetricSpecification,
+    NetworkRuleSet,
+    Operation,
+    OperationDisplay,
+    OperationListResult,
+    Resource,
+    Restriction,
+    SKUCapability,
+    ServiceSasParameters,
+    ServiceSpecification,
+    Sku,
+    StorageAccount,
+    StorageAccountCheckNameAvailabilityParameters,
+    StorageAccountCreateParameters,
+    StorageAccountKey,
+    StorageAccountListKeysResult,
+    StorageAccountListResult,
+    StorageAccountManagementPolicies,
+    StorageAccountManagementPoliciesRulesProperty,
+    StorageAccountRegenerateKeyParameters,
+    StorageAccountUpdateParameters,
+    StorageSkuListResult,
+    TagProperty,
+    TrackedResource,
+    UpdateHistoryProperty,
+    Usage,
+    UsageListResult,
+    UsageName,
+    VirtualNetworkRule,
+)
+
+from ._storage_management_client_enums import (  # type: ignore
+    AccessTier,
+    AccountStatus,
+    Bypass,
+    DefaultAction,
+    Enum13,
+    HttpProtocol,
+    ImmutabilityPolicyState,
+    ImmutabilityPolicyUpdateType,
+    KeyPermission,
+    KeySource,
+    Kind,
+    LeaseContainerRequestAction,
+    LeaseDuration,
+    LeaseState,
+    LeaseStatus,
+    ManagementPolicyName,
+    Permissions,
+    ProvisioningState,
+    PublicAccess,
+    Reason,
+    ReasonCode,
+    Services,
+    SignedResource,
+    SignedResourceTypes,
+    SkuName,
+    SkuTier,
+    State,
+    UsageUnit,
+)
 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__ = [
@@ -177,5 +188,5 @@
     "State",
     "UsageUnit",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/models/_models_py3.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/models/_models_py3.py
index 9ca85d76f85c..79eadfdb5916 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/models/_models_py3.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/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.
@@ -16,10 +16,9 @@
 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
 
 if TYPE_CHECKING:
-    # pylint: disable=unused-import,ungrouped-imports
     from .. import models as _models
 JSON = MutableMapping[str, Any]  # pylint: disable=unsubscriptable-object
 
@@ -200,7 +199,7 @@ def __init__(self, **kwargs: Any) -> None:
         self.etag = None
 
 
-class BlobContainer(AzureEntityResource):  # pylint: disable=too-many-instance-attributes
+class BlobContainer(AzureEntityResource):
     """Properties of the blob container, including Id, resource name, resource type, Etag.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -806,7 +805,7 @@ class LeaseContainerRequest(_serialization.Model):
     All required parameters must be populated in order to send to server.
 
     :ivar action: Specifies the lease action. Can be one of the available actions. Required. Known
-     values are: "Acquire", "Renew", "Change", "Release", and "Break".
+     values are: "Acquire", "Renew", "Change", "Release", "Break", and "Break".
     :vartype action: str or
      ~azure.mgmt.storage.v2018_03_01_preview.models.LeaseContainerRequestAction
     :ivar lease_id: Identifies the lease. Can be specified in any valid GUID string format.
@@ -846,7 +845,7 @@ def __init__(
     ) -> None:
         """
         :keyword action: Specifies the lease action. Can be one of the available actions. Required.
-         Known values are: "Acquire", "Renew", "Change", "Release", and "Break".
+         Known values are: "Acquire", "Renew", "Change", "Release", "Break", and "Break".
         :paramtype action: str or
          ~azure.mgmt.storage.v2018_03_01_preview.models.LeaseContainerRequestAction
         :keyword lease_id: Identifies the lease. Can be specified in any valid GUID string format.
@@ -993,7 +992,7 @@ def __init__(self, **kwargs: Any) -> None:
         self.account_sas_token = None
 
 
-class ListContainerItem(AzureEntityResource):  # pylint: disable=too-many-instance-attributes
+class ListContainerItem(AzureEntityResource):
     """The blob container properties be listed out.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -1488,7 +1487,7 @@ def __init__(self, *, reason_code: Optional[Union[str, "_models.ReasonCode"]] =
         self.reason_code = reason_code
 
 
-class ServiceSasParameters(_serialization.Model):  # pylint: disable=too-many-instance-attributes
+class ServiceSasParameters(_serialization.Model):
     """The parameters to list service SAS credentials of a specific resource.
 
     All required parameters must be populated in order to send to server.
@@ -1831,7 +1830,7 @@ def __init__(self, *, location: str, tags: Optional[Dict[str, str]] = None, **kw
         self.location = location
 
 
-class StorageAccount(TrackedResource):  # pylint: disable=too-many-instance-attributes
+class StorageAccount(TrackedResource):
     """The storage account.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -2031,7 +2030,7 @@ def __init__(self, *, name: str, **kwargs: Any) -> None:
         self.name = name
 
 
-class StorageAccountCreateParameters(_serialization.Model):  # pylint: disable=too-many-instance-attributes
+class StorageAccountCreateParameters(_serialization.Model):
     """The parameters used when creating a storage account.
 
     All required parameters must be populated in order to send to server.
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/models/_storage_management_client_enums.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/models/_storage_management_client_enums.py
index 67ac5d08d6fc..791d36adcf7e 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/models/_storage_management_client_enums.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/models/_storage_management_client_enums.py
@@ -106,6 +106,7 @@ class LeaseContainerRequestAction(str, Enum, metaclass=CaseInsensitiveEnumMeta):
     RENEW = "Renew"
     CHANGE = "Change"
     RELEASE = "Release"
+    BREAK = "Break"
     BREAK_ENUM = "Break"
 
 
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/operations/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/operations/__init__.py
index f701c9204162..20a9703954a4 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/operations/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/operations/__init__.py
@@ -5,16 +5,22 @@
 # Code generated by Microsoft (R) AutoRest Code Generator.
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
+# pylint: disable=wrong-import-position
 
-from ._operations import Operations
-from ._skus_operations import SkusOperations
-from ._storage_accounts_operations import StorageAccountsOperations
-from ._usages_operations import UsagesOperations
-from ._blob_containers_operations import BlobContainersOperations
-from ._management_policies_operations import ManagementPoliciesOperations
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._operations import Operations  # type: ignore
+from ._skus_operations import SkusOperations  # type: ignore
+from ._storage_accounts_operations import StorageAccountsOperations  # type: ignore
+from ._usages_operations import UsagesOperations  # type: ignore
+from ._blob_containers_operations import BlobContainersOperations  # type: ignore
+from ._management_policies_operations import ManagementPoliciesOperations  # type: ignore
 
 from ._patch import __all__ as _patch_all
-from ._patch import *  # pylint: disable=unused-wildcard-import
+from ._patch import *
 from ._patch import patch_sdk as _patch_sdk
 
 __all__ = [
@@ -25,5 +31,5 @@
     "BlobContainersOperations",
     "ManagementPoliciesOperations",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/operations/_blob_containers_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/operations/_blob_containers_operations.py
index ecff71203244..3f43ca5dc8fb 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/operations/_blob_containers_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/operations/_blob_containers_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,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,
@@ -19,20 +19,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -573,7 +571,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
         :rtype: ~azure.mgmt.storage.v2018_03_01_preview.models.ListContainerItems
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -597,7 +595,6 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -611,7 +608,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListContainerItems", pipeline_response)
+        deserialized = self._deserialize("ListContainerItems", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -724,7 +721,7 @@ def create(
         :rtype: ~azure.mgmt.storage.v2018_03_01_preview.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -761,7 +758,6 @@ def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -775,7 +771,7 @@ def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -885,7 +881,7 @@ def update(
         :rtype: ~azure.mgmt.storage.v2018_03_01_preview.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -922,7 +918,6 @@ def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -936,7 +931,7 @@ def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -965,7 +960,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2018_03_01_preview.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -990,7 +985,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1004,7 +998,7 @@ def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1033,7 +1027,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,
@@ -1058,7 +1052,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1181,7 +1174,7 @@ def set_legal_hold(
         :rtype: ~azure.mgmt.storage.v2018_03_01_preview.models.LegalHold
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1218,7 +1211,6 @@ def set_legal_hold(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1232,7 +1224,7 @@ def set_legal_hold(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LegalHold", pipeline_response)
+        deserialized = self._deserialize("LegalHold", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1342,7 +1334,7 @@ def clear_legal_hold(
         :rtype: ~azure.mgmt.storage.v2018_03_01_preview.models.LegalHold
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1379,7 +1371,6 @@ def clear_legal_hold(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1393,7 +1384,7 @@ def clear_legal_hold(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LegalHold", pipeline_response)
+        deserialized = self._deserialize("LegalHold", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1533,7 +1524,7 @@ def create_or_update_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2018_03_01_preview.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1575,7 +1566,6 @@ def create_or_update_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1592,7 +1582,7 @@ def create_or_update_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1635,7 +1625,7 @@ def get_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2018_03_01_preview.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1662,7 +1652,6 @@ def get_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1679,7 +1668,7 @@ def get_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1724,7 +1713,7 @@ def delete_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2018_03_01_preview.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1751,7 +1740,6 @@ def delete_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1768,7 +1756,7 @@ def delete_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1802,7 +1790,7 @@ def lock_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2018_03_01_preview.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1828,7 +1816,6 @@ def lock_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1845,7 +1832,7 @@ def lock_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1976,7 +1963,7 @@ def extend_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2018_03_01_preview.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -2017,7 +2004,6 @@ def extend_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -2034,7 +2020,7 @@ def extend_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -2145,7 +2131,7 @@ def lease(
         :rtype: ~azure.mgmt.storage.v2018_03_01_preview.models.LeaseContainerResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -2185,7 +2171,6 @@ def lease(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -2199,7 +2184,7 @@ def lease(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LeaseContainerResponse", pipeline_response)
+        deserialized = self._deserialize("LeaseContainerResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/operations/_management_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/operations/_management_policies_operations.py
index 777ed8680d1b..a9afaec7a36a 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/operations/_management_policies_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/operations/_management_policies_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,
@@ -19,20 +18,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -196,7 +193,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2018_03_01_preview.models.StorageAccountManagementPolicies
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -221,7 +218,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -235,7 +231,7 @@ def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountManagementPolicies", pipeline_response)
+        deserialized = self._deserialize("StorageAccountManagementPolicies", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -341,7 +337,7 @@ def create_or_update(
         :rtype: ~azure.mgmt.storage.v2018_03_01_preview.models.StorageAccountManagementPolicies
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -378,7 +374,6 @@ def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -392,7 +387,7 @@ def create_or_update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountManagementPolicies", pipeline_response)
+        deserialized = self._deserialize("StorageAccountManagementPolicies", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -424,7 +419,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,
@@ -449,7 +444,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/operations/_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/operations/_operations.py
index d71ba6b97aca..5f543c052e60 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/operations/_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/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 (
@@ -20,20 +19,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -96,7 +93,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.Operation"]:
         )
         cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -112,7 +109,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -128,7 +124,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/operations/_skus_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/operations/_skus_operations.py
index 787e21154230..fbbd6da4054d 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/operations/_skus_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/operations/_skus_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 (
@@ -20,20 +19,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -101,7 +98,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.Sku"]:
         )
         cls: ClsType[_models.StorageSkuListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -118,7 +115,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -134,7 +130,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/operations/_storage_accounts_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/operations/_storage_accounts_operations.py
index 29f8bbd371ee..52908febfe4b 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/operations/_storage_accounts_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/operations/_storage_accounts_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,7 @@
 # --------------------------------------------------------------------------
 from io import IOBase
 import sys
-from typing import Any, Callable, Dict, IO, Iterable, 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 (
@@ -17,13 +17,14 @@
     ResourceExistsError,
     ResourceNotFoundError,
     ResourceNotModifiedError,
+    StreamClosedError,
+    StreamConsumedError,
     map_error,
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
 from azure.core.polling import LROPoller, NoPolling, PollingMethod
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
@@ -31,12 +32,11 @@
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -589,7 +589,7 @@ def check_name_availability(
         :rtype: ~azure.mgmt.storage.v2018_03_01_preview.models.CheckNameAvailabilityResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -623,7 +623,6 @@ def check_name_availability(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -637,7 +636,7 @@ def check_name_availability(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response)
+        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -650,8 +649,8 @@ def _create_initial(
         account_name: str,
         parameters: Union[_models.StorageAccountCreateParameters, IO[bytes]],
         **kwargs: Any
-    ) -> Optional[_models.StorageAccount]:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> Iterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -666,7 +665,7 @@ def _create_initial(
             "api_version", _params.pop("api-version", self._api_version or "2018-03-01-preview")
         )
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
-        cls: ClsType[Optional[_models.StorageAccount]] = kwargs.pop("cls", None)
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
         _json = None
@@ -687,10 +686,10 @@ def _create_initial(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -698,12 +697,14 @@ def _create_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = None
-        if response.status_code == 200:
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -831,10 +832,11 @@ def begin_create(
                 params=_params,
                 **kwargs
             )
+            raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+            deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
             if cls:
                 return cls(pipeline_response, deserialized, {})  # type: ignore
             return deserialized
@@ -873,7 +875,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,
@@ -897,7 +899,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -931,7 +932,7 @@ def get_properties(self, resource_group_name: str, account_name: str, **kwargs:
         :rtype: ~azure.mgmt.storage.v2018_03_01_preview.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -955,7 +956,6 @@ def get_properties(self, resource_group_name: str, account_name: str, **kwargs:
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -969,7 +969,7 @@ def get_properties(self, resource_group_name: str, account_name: str, **kwargs:
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1080,7 +1080,7 @@ def update(
         :rtype: ~azure.mgmt.storage.v2018_03_01_preview.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1116,7 +1116,6 @@ def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1130,7 +1129,7 @@ def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1155,7 +1154,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.StorageAccount"]:
         )
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1172,7 +1171,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -1188,7 +1186,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -1238,7 +1235,7 @@ def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> Ite
         )
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1256,7 +1253,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -1272,7 +1268,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -1318,7 +1313,7 @@ def list_keys(
         :rtype: ~azure.mgmt.storage.v2018_03_01_preview.models.StorageAccountListKeysResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1342,7 +1337,6 @@ def list_keys(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1356,7 +1350,7 @@ def list_keys(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response)
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1450,7 +1444,7 @@ def regenerate_key(
         :rtype: ~azure.mgmt.storage.v2018_03_01_preview.models.StorageAccountListKeysResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1486,7 +1480,6 @@ def regenerate_key(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1500,7 +1493,7 @@ def regenerate_key(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response)
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1592,7 +1585,7 @@ def list_account_sas(
         :rtype: ~azure.mgmt.storage.v2018_03_01_preview.models.ListAccountSasResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1628,7 +1621,6 @@ def list_account_sas(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1642,7 +1634,7 @@ def list_account_sas(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListAccountSasResponse", pipeline_response)
+        deserialized = self._deserialize("ListAccountSasResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1732,7 +1724,7 @@ def list_service_sas(
         :rtype: ~azure.mgmt.storage.v2018_03_01_preview.models.ListServiceSasResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1768,7 +1760,6 @@ def list_service_sas(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1782,7 +1773,7 @@ def list_service_sas(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListServiceSasResponse", pipeline_response)
+        deserialized = self._deserialize("ListServiceSasResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1814,7 +1805,7 @@ def get_management_policies(
         :rtype: ~azure.mgmt.storage.v2018_03_01_preview.models.StorageAccountManagementPolicies
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1839,7 +1830,6 @@ def get_management_policies(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1853,7 +1843,7 @@ def get_management_policies(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountManagementPolicies", pipeline_response)
+        deserialized = self._deserialize("StorageAccountManagementPolicies", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1959,7 +1949,7 @@ def create_or_update_management_policies(
         :rtype: ~azure.mgmt.storage.v2018_03_01_preview.models.StorageAccountManagementPolicies
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1996,7 +1986,6 @@ def create_or_update_management_policies(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -2010,7 +1999,7 @@ def create_or_update_management_policies(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountManagementPolicies", pipeline_response)
+        deserialized = self._deserialize("StorageAccountManagementPolicies", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -2042,7 +2031,7 @@ def delete_management_policies(  # pylint: disable=inconsistent-return-statement
         :rtype: None
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -2067,7 +2056,6 @@ def delete_management_policies(  # pylint: disable=inconsistent-return-statement
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/operations/_usages_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/operations/_usages_operations.py
index c8b444c05815..55523316cc07 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/operations/_usages_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_03_01_preview/operations/_usages_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 (
@@ -20,20 +19,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -128,7 +125,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.Usage"]:
         )
         cls: ClsType[_models.UsageListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -145,7 +142,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -161,7 +157,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -209,7 +204,7 @@ def list_by_location(self, location: str, **kwargs: Any) -> Iterable["_models.Us
         )
         cls: ClsType[_models.UsageListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -227,7 +222,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -243,7 +237,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/__init__.py
index a860a5c185c9..60980065e1ee 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/__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 ._storage_management_client import StorageManagementClient
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._storage_management_client import StorageManagementClient  # 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__ = [
     "StorageManagementClient",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/_configuration.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/_configuration.py
index 48876935caba..3dbc4307f975 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/_configuration.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/_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 StorageManagementClientConfiguration:  # pylint: disable=too-many-instance-attributes,name-too-long
+class StorageManagementClientConfiguration:  # pylint: disable=too-many-instance-attributes
     """Configuration for StorageManagementClient.
 
     Note that all parameters used to create this instance are saved as instance
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/_metadata.json b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/_metadata.json
index d557e44445ef..5fd828b2329b 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/_metadata.json
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/_metadata.json
@@ -10,8 +10,8 @@
         "azure_arm": true,
         "has_public_lro_operations": true,
         "client_side_validation": false,
-        "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"ARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementClientConfiguration\"], \".._serialization\": [\"Deserializer\", \"Serializer\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}}",
-        "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"AsyncARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"AsyncARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementClientConfiguration\"], \"..._serialization\": [\"Deserializer\", \"Serializer\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"]}}}"
+        "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"ARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementClientConfiguration\"], \".._serialization\": [\"Deserializer\", \"Serializer\"]}, \"stdlib\": {\"typing_extensions\": [\"Self\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}}",
+        "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"AsyncARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"AsyncARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementClientConfiguration\"], \"..._serialization\": [\"Deserializer\", \"Serializer\"]}, \"stdlib\": {\"typing_extensions\": [\"Self\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"]}}}"
     },
     "global_parameters": {
         "sync": {
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/_storage_management_client.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/_storage_management_client.py
index aa238335366a..2602ab1e9537 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/_storage_management_client.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/_storage_management_client.py
@@ -8,6 +8,7 @@
 
 from copy import deepcopy
 from typing import Any, TYPE_CHECKING
+from typing_extensions import Self
 
 from azure.core.pipeline import policies
 from azure.core.rest import HttpRequest, HttpResponse
@@ -27,11 +28,10 @@
 )
 
 if TYPE_CHECKING:
-    # pylint: disable=unused-import,ungrouped-imports
     from azure.core.credentials import TokenCredential
 
 
-class StorageManagementClient:  # pylint: disable=client-accepts-api-version-keyword
+class StorageManagementClient:
     """The Azure Storage Management API.
 
     :ivar operations: Operations operations
@@ -131,7 +131,7 @@ def _send_request(self, request: HttpRequest, *, stream: bool = False, **kwargs:
     def close(self) -> None:
         self._client.close()
 
-    def __enter__(self) -> "StorageManagementClient":
+    def __enter__(self) -> Self:
         self._client.__enter__()
         return self
 
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/_vendor.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/_vendor.py
deleted file mode 100644
index 0dafe0e287ff..000000000000
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/_vendor.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# --------------------------------------------------------------------------
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License. See License.txt in the project root for license information.
-# Code generated by Microsoft (R) AutoRest Code Generator.
-# Changes may cause incorrect behavior and will be lost if the code is regenerated.
-# --------------------------------------------------------------------------
-
-from azure.core.pipeline.transport import HttpRequest
-
-
-def _convert_request(request, files=None):
-    data = request.content if not files else None
-    request = HttpRequest(method=request.method, url=request.url, headers=request.headers, data=data)
-    if files:
-        request.set_formdata_body(files)
-    return request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/_version.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/_version.py
index 5a163c0afedc..e5754a47ce68 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/_version.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/_version.py
@@ -6,4 +6,4 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-VERSION = "21.2.1"
\ No newline at end of file
+VERSION = "1.0.0b1"
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/aio/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/aio/__init__.py
index a5c3d2414cfd..ee2b940bd4fc 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/aio/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/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 ._storage_management_client import StorageManagementClient
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._storage_management_client import StorageManagementClient  # 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__ = [
     "StorageManagementClient",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/aio/_configuration.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/aio/_configuration.py
index 9834f6fcca65..9c0a1ab0fdb4 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/aio/_configuration.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/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 StorageManagementClientConfiguration:  # pylint: disable=too-many-instance-attributes,name-too-long
+class StorageManagementClientConfiguration:  # pylint: disable=too-many-instance-attributes
     """Configuration for StorageManagementClient.
 
     Note that all parameters used to create this instance are saved as instance
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/aio/_storage_management_client.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/aio/_storage_management_client.py
index 21b109512895..d367ceec7c66 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/aio/_storage_management_client.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/aio/_storage_management_client.py
@@ -8,6 +8,7 @@
 
 from copy import deepcopy
 from typing import Any, Awaitable, TYPE_CHECKING
+from typing_extensions import Self
 
 from azure.core.pipeline import policies
 from azure.core.rest import AsyncHttpResponse, HttpRequest
@@ -27,11 +28,10 @@
 )
 
 if TYPE_CHECKING:
-    # pylint: disable=unused-import,ungrouped-imports
     from azure.core.credentials_async import AsyncTokenCredential
 
 
-class StorageManagementClient:  # pylint: disable=client-accepts-api-version-keyword
+class StorageManagementClient:
     """The Azure Storage Management API.
 
     :ivar operations: Operations operations
@@ -135,7 +135,7 @@ def _send_request(
     async def close(self) -> None:
         await self._client.close()
 
-    async def __aenter__(self) -> "StorageManagementClient":
+    async def __aenter__(self) -> Self:
         await self._client.__aenter__()
         return self
 
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/aio/operations/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/aio/operations/__init__.py
index d54538e70fca..2904c4bb3f14 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/aio/operations/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/aio/operations/__init__.py
@@ -5,16 +5,22 @@
 # Code generated by Microsoft (R) AutoRest Code Generator.
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
+# pylint: disable=wrong-import-position
 
-from ._operations import Operations
-from ._skus_operations import SkusOperations
-from ._storage_accounts_operations import StorageAccountsOperations
-from ._usages_operations import UsagesOperations
-from ._blob_services_operations import BlobServicesOperations
-from ._blob_containers_operations import BlobContainersOperations
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._operations import Operations  # type: ignore
+from ._skus_operations import SkusOperations  # type: ignore
+from ._storage_accounts_operations import StorageAccountsOperations  # type: ignore
+from ._usages_operations import UsagesOperations  # type: ignore
+from ._blob_services_operations import BlobServicesOperations  # type: ignore
+from ._blob_containers_operations import BlobContainersOperations  # type: ignore
 
 from ._patch import __all__ as _patch_all
-from ._patch import *  # pylint: disable=unused-wildcard-import
+from ._patch import *
 from ._patch import patch_sdk as _patch_sdk
 
 __all__ = [
@@ -25,5 +31,5 @@
     "BlobServicesOperations",
     "BlobContainersOperations",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/aio/operations/_blob_containers_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/aio/operations/_blob_containers_operations.py
index 5a367dbd3d97..b1f019d7358d 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/aio/operations/_blob_containers_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/aio/operations/_blob_containers_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,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,
@@ -19,14 +19,12 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._blob_containers_operations import (
     build_clear_legal_hold_request,
     build_create_or_update_immutability_policy_request,
@@ -46,7 +44,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]]
 
@@ -87,7 +85,7 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
         :rtype: ~azure.mgmt.storage.v2018_07_01.models.ListContainerItems
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -109,7 +107,6 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -123,7 +120,7 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListContainerItems", pipeline_response)
+        deserialized = self._deserialize("ListContainerItems", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -236,7 +233,7 @@ async def create(
         :rtype: ~azure.mgmt.storage.v2018_07_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -271,7 +268,6 @@ async def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -285,7 +281,7 @@ async def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -395,7 +391,7 @@ async def update(
         :rtype: ~azure.mgmt.storage.v2018_07_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -430,7 +426,6 @@ async def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -444,7 +439,7 @@ async def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -473,7 +468,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2018_07_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -496,7 +491,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -510,7 +504,7 @@ async def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -518,9 +512,7 @@ async def get(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, container_name: str, **kwargs: Any
-    ) -> None:
+    async def delete(self, resource_group_name: str, account_name: str, container_name: str, **kwargs: Any) -> None:
         """Deletes specified container under its account.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -539,7 +531,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,
@@ -562,7 +554,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -685,7 +676,7 @@ async def set_legal_hold(
         :rtype: ~azure.mgmt.storage.v2018_07_01.models.LegalHold
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -720,7 +711,6 @@ async def set_legal_hold(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -734,7 +724,7 @@ async def set_legal_hold(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LegalHold", pipeline_response)
+        deserialized = self._deserialize("LegalHold", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -844,7 +834,7 @@ async def clear_legal_hold(
         :rtype: ~azure.mgmt.storage.v2018_07_01.models.LegalHold
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -879,7 +869,6 @@ async def clear_legal_hold(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -893,7 +882,7 @@ async def clear_legal_hold(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LegalHold", pipeline_response)
+        deserialized = self._deserialize("LegalHold", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1032,7 +1021,7 @@ async def create_or_update_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2018_07_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1072,7 +1061,6 @@ async def create_or_update_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1089,7 +1077,7 @@ async def create_or_update_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1132,7 +1120,7 @@ async def get_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2018_07_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1157,7 +1145,6 @@ async def get_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1174,7 +1161,7 @@ async def get_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1219,7 +1206,7 @@ async def delete_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2018_07_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1244,7 +1231,6 @@ async def delete_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1261,7 +1247,7 @@ async def delete_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1295,7 +1281,7 @@ async def lock_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2018_07_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1319,7 +1305,6 @@ async def lock_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1336,7 +1321,7 @@ async def lock_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1466,7 +1451,7 @@ async def extend_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2018_07_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1505,7 +1490,6 @@ async def extend_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1522,7 +1506,7 @@ async def extend_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1632,7 +1616,7 @@ async def lease(
         :rtype: ~azure.mgmt.storage.v2018_07_01.models.LeaseContainerResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1670,7 +1654,6 @@ async def lease(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1684,7 +1667,7 @@ async def lease(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LeaseContainerResponse", pipeline_response)
+        deserialized = self._deserialize("LeaseContainerResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/aio/operations/_blob_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/aio/operations/_blob_services_operations.py
index 18698bdd55ae..bf5893df178d 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/aio/operations/_blob_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/aio/operations/_blob_services_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,
@@ -19,14 +18,12 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._blob_services_operations import (
     build_get_service_properties_request,
     build_set_service_properties_request,
@@ -35,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]]
 
@@ -160,7 +157,7 @@ async def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2018_07_01.models.BlobServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -195,7 +192,6 @@ async def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -209,7 +205,7 @@ async def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobServiceProperties", pipeline_response)
+        deserialized = self._deserialize("BlobServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -237,7 +233,7 @@ async def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2018_07_01.models.BlobServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -260,7 +256,6 @@ async def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -274,7 +269,7 @@ async def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobServiceProperties", pipeline_response)
+        deserialized = self._deserialize("BlobServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/aio/operations/_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/aio/operations/_operations.py
index 5f4934670d7c..ba86951d4909 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/aio/operations/_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/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
@@ -20,20 +19,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._operations import build_list_request
 
 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]]
 
@@ -73,7 +70,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.Operation"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-07-01"))
         cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -89,7 +86,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -105,7 +101,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/aio/operations/_skus_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/aio/operations/_skus_operations.py
index 1ab41a9c5ad3..2940d1170d6f 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/aio/operations/_skus_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/aio/operations/_skus_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
@@ -20,20 +19,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._skus_operations import build_list_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
 
@@ -72,7 +69,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.Sku"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-07-01"))
         cls: ClsType[_models.StorageSkuListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -89,7 +86,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -105,7 +101,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/aio/operations/_storage_accounts_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/aio/operations/_storage_accounts_operations.py
index 6ffafa121ada..0321bc69342f 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/aio/operations/_storage_accounts_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/aio/operations/_storage_accounts_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,20 @@
 # --------------------------------------------------------------------------
 from io import IOBase
 import sys
-from typing import Any, AsyncIterable, Callable, Dict, IO, Literal, Optional, Type, TypeVar, Union, cast, overload
+from typing import (
+    Any,
+    AsyncIterable,
+    AsyncIterator,
+    Callable,
+    Dict,
+    IO,
+    Literal,
+    Optional,
+    TypeVar,
+    Union,
+    cast,
+    overload,
+)
 import urllib.parse
 
 from azure.core.async_paging import AsyncItemPaged, AsyncList
@@ -18,12 +31,13 @@
     ResourceExistsError,
     ResourceNotFoundError,
     ResourceNotModifiedError,
+    StreamClosedError,
+    StreamConsumedError,
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
 from azure.core.polling import AsyncLROPoller, AsyncNoPolling, AsyncPollingMethod
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
@@ -31,7 +45,6 @@
 from azure.mgmt.core.polling.async_arm_polling import AsyncARMPolling
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._storage_accounts_operations import (
     build_check_name_availability_request,
     build_create_request,
@@ -50,7 +63,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]]
 
@@ -133,7 +146,7 @@ async def check_name_availability(
         :rtype: ~azure.mgmt.storage.v2018_07_01.models.CheckNameAvailabilityResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -165,7 +178,6 @@ async def check_name_availability(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -179,7 +191,7 @@ async def check_name_availability(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response)
+        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -192,8 +204,8 @@ async def _create_initial(
         account_name: str,
         parameters: Union[_models.StorageAccountCreateParameters, IO[bytes]],
         **kwargs: Any
-    ) -> Optional[_models.StorageAccount]:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -206,7 +218,7 @@ async def _create_initial(
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-07-01"))
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
-        cls: ClsType[Optional[_models.StorageAccount]] = kwargs.pop("cls", None)
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
         _json = None
@@ -227,10 +239,10 @@ async def _create_initial(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -238,12 +250,14 @@ async def _create_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = None
-        if response.status_code == 200:
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -369,10 +383,11 @@ async def begin_create(
                 params=_params,
                 **kwargs
             )
+            await raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+            deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
             if cls:
                 return cls(pipeline_response, deserialized, {})  # type: ignore
             return deserialized
@@ -395,9 +410,7 @@ def get_long_running_output(pipeline_response):
         )
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, **kwargs: Any
-    ) -> None:
+    async def delete(self, resource_group_name: str, account_name: str, **kwargs: Any) -> None:
         """Deletes a storage account in Microsoft Azure.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -411,7 +424,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,
@@ -433,7 +446,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -477,7 +489,7 @@ async def get_properties(
         :rtype: ~azure.mgmt.storage.v2018_07_01.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -500,7 +512,6 @@ async def get_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -514,7 +525,7 @@ async def get_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -625,7 +636,7 @@ async def update(
         :rtype: ~azure.mgmt.storage.v2018_07_01.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -659,7 +670,6 @@ async def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -673,7 +683,7 @@ async def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -696,7 +706,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.StorageAccount"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-07-01"))
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -713,7 +723,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -729,7 +738,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -779,7 +787,7 @@ def list_by_resource_group(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-07-01"))
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -797,7 +805,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -813,7 +820,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -859,7 +865,7 @@ async def list_keys(
         :rtype: ~azure.mgmt.storage.v2018_07_01.models.StorageAccountListKeysResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -881,7 +887,6 @@ async def list_keys(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -895,7 +900,7 @@ async def list_keys(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response)
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -988,7 +993,7 @@ async def regenerate_key(
         :rtype: ~azure.mgmt.storage.v2018_07_01.models.StorageAccountListKeysResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1022,7 +1027,6 @@ async def regenerate_key(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1036,7 +1040,7 @@ async def regenerate_key(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response)
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1127,7 +1131,7 @@ async def list_account_sas(
         :rtype: ~azure.mgmt.storage.v2018_07_01.models.ListAccountSasResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1161,7 +1165,6 @@ async def list_account_sas(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1175,7 +1178,7 @@ async def list_account_sas(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListAccountSasResponse", pipeline_response)
+        deserialized = self._deserialize("ListAccountSasResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1264,7 +1267,7 @@ async def list_service_sas(
         :rtype: ~azure.mgmt.storage.v2018_07_01.models.ListServiceSasResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1298,7 +1301,6 @@ async def list_service_sas(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1312,17 +1314,17 @@ async def list_service_sas(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListServiceSasResponse", pipeline_response)
+        deserialized = self._deserialize("ListServiceSasResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
 
         return deserialized  # type: ignore
 
-    async def _failover_initial(  # pylint: disable=inconsistent-return-statements
+    async def _failover_initial(
         self, resource_group_name: str, account_name: str, **kwargs: Any
-    ) -> None:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1334,7 +1336,7 @@ async def _failover_initial(  # pylint: disable=inconsistent-return-statements
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-07-01"))
-        cls: ClsType[None] = kwargs.pop("cls", None)
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
 
         _request = build_failover_request(
             resource_group_name=resource_group_name,
@@ -1344,10 +1346,10 @@ async def _failover_initial(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -1355,11 +1357,19 @@ async def _failover_initial(  # pylint: disable=inconsistent-return-statements
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
-            return cls(pipeline_response, None, {})  # type: ignore
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
 
     @distributed_trace_async
     async def begin_failover(self, resource_group_name: str, account_name: str, **kwargs: Any) -> AsyncLROPoller[None]:
@@ -1387,7 +1397,7 @@ async def begin_failover(self, resource_group_name: str, account_name: str, **kw
         lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
         cont_token: Optional[str] = kwargs.pop("continuation_token", None)
         if cont_token is None:
-            raw_result = await self._failover_initial(  # type: ignore
+            raw_result = await self._failover_initial(
                 resource_group_name=resource_group_name,
                 account_name=account_name,
                 api_version=api_version,
@@ -1396,6 +1406,7 @@ async def begin_failover(self, resource_group_name: str, account_name: str, **kw
                 params=_params,
                 **kwargs
             )
+            await raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/aio/operations/_usages_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/aio/operations/_usages_operations.py
index eace551a20fc..66c647819224 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/aio/operations/_usages_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/aio/operations/_usages_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
@@ -20,20 +19,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._usages_operations import build_list_by_location_request
 
 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 +72,7 @@ def list_by_location(self, location: str, **kwargs: Any) -> AsyncIterable["_mode
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-07-01"))
         cls: ClsType[_models.UsageListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -93,7 +90,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -109,7 +105,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/models/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/models/__init__.py
index 6646e7851c0f..e3cd747185aa 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/models/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/models/__init__.py
@@ -5,94 +5,105 @@
 # 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 AccountSasParameters
-from ._models_py3 import AzureEntityResource
-from ._models_py3 import BlobContainer
-from ._models_py3 import BlobServiceProperties
-from ._models_py3 import CheckNameAvailabilityResult
-from ._models_py3 import CorsRule
-from ._models_py3 import CorsRules
-from ._models_py3 import CustomDomain
-from ._models_py3 import DeleteRetentionPolicy
-from ._models_py3 import Dimension
-from ._models_py3 import Encryption
-from ._models_py3 import EncryptionService
-from ._models_py3 import EncryptionServices
-from ._models_py3 import Endpoints
-from ._models_py3 import GeoReplicationStats
-from ._models_py3 import IPRule
-from ._models_py3 import Identity
-from ._models_py3 import ImmutabilityPolicy
-from ._models_py3 import ImmutabilityPolicyProperties
-from ._models_py3 import KeyVaultProperties
-from ._models_py3 import LeaseContainerRequest
-from ._models_py3 import LeaseContainerResponse
-from ._models_py3 import LegalHold
-from ._models_py3 import LegalHoldProperties
-from ._models_py3 import ListAccountSasResponse
-from ._models_py3 import ListContainerItem
-from ._models_py3 import ListContainerItems
-from ._models_py3 import ListServiceSasResponse
-from ._models_py3 import MetricSpecification
-from ._models_py3 import NetworkRuleSet
-from ._models_py3 import Operation
-from ._models_py3 import OperationDisplay
-from ._models_py3 import OperationListResult
-from ._models_py3 import Resource
-from ._models_py3 import Restriction
-from ._models_py3 import SKUCapability
-from ._models_py3 import ServiceSasParameters
-from ._models_py3 import ServiceSpecification
-from ._models_py3 import Sku
-from ._models_py3 import StorageAccount
-from ._models_py3 import StorageAccountCheckNameAvailabilityParameters
-from ._models_py3 import StorageAccountCreateParameters
-from ._models_py3 import StorageAccountKey
-from ._models_py3 import StorageAccountListKeysResult
-from ._models_py3 import StorageAccountListResult
-from ._models_py3 import StorageAccountRegenerateKeyParameters
-from ._models_py3 import StorageAccountUpdateParameters
-from ._models_py3 import StorageSkuListResult
-from ._models_py3 import TagProperty
-from ._models_py3 import TrackedResource
-from ._models_py3 import UpdateHistoryProperty
-from ._models_py3 import Usage
-from ._models_py3 import UsageListResult
-from ._models_py3 import UsageName
-from ._models_py3 import VirtualNetworkRule
+from typing import TYPE_CHECKING
 
-from ._storage_management_client_enums import AccessTier
-from ._storage_management_client_enums import AccountStatus
-from ._storage_management_client_enums import Bypass
-from ._storage_management_client_enums import CorsRuleAllowedMethodsItem
-from ._storage_management_client_enums import DefaultAction
-from ._storage_management_client_enums import Enum8
-from ._storage_management_client_enums import GeoReplicationStatus
-from ._storage_management_client_enums import HttpProtocol
-from ._storage_management_client_enums import ImmutabilityPolicyState
-from ._storage_management_client_enums import ImmutabilityPolicyUpdateType
-from ._storage_management_client_enums import KeyPermission
-from ._storage_management_client_enums import KeySource
-from ._storage_management_client_enums import Kind
-from ._storage_management_client_enums import LeaseContainerRequestAction
-from ._storage_management_client_enums import LeaseDuration
-from ._storage_management_client_enums import LeaseState
-from ._storage_management_client_enums import LeaseStatus
-from ._storage_management_client_enums import Permissions
-from ._storage_management_client_enums import ProvisioningState
-from ._storage_management_client_enums import PublicAccess
-from ._storage_management_client_enums import Reason
-from ._storage_management_client_enums import ReasonCode
-from ._storage_management_client_enums import Services
-from ._storage_management_client_enums import SignedResource
-from ._storage_management_client_enums import SignedResourceTypes
-from ._storage_management_client_enums import SkuName
-from ._storage_management_client_enums import SkuTier
-from ._storage_management_client_enums import State
-from ._storage_management_client_enums import UsageUnit
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+
+from ._models_py3 import (  # type: ignore
+    AccountSasParameters,
+    AzureEntityResource,
+    BlobContainer,
+    BlobServiceProperties,
+    CheckNameAvailabilityResult,
+    CorsRule,
+    CorsRules,
+    CustomDomain,
+    DeleteRetentionPolicy,
+    Dimension,
+    Encryption,
+    EncryptionService,
+    EncryptionServices,
+    Endpoints,
+    GeoReplicationStats,
+    IPRule,
+    Identity,
+    ImmutabilityPolicy,
+    ImmutabilityPolicyProperties,
+    KeyVaultProperties,
+    LeaseContainerRequest,
+    LeaseContainerResponse,
+    LegalHold,
+    LegalHoldProperties,
+    ListAccountSasResponse,
+    ListContainerItem,
+    ListContainerItems,
+    ListServiceSasResponse,
+    MetricSpecification,
+    NetworkRuleSet,
+    Operation,
+    OperationDisplay,
+    OperationListResult,
+    Resource,
+    Restriction,
+    SKUCapability,
+    ServiceSasParameters,
+    ServiceSpecification,
+    Sku,
+    StorageAccount,
+    StorageAccountCheckNameAvailabilityParameters,
+    StorageAccountCreateParameters,
+    StorageAccountKey,
+    StorageAccountListKeysResult,
+    StorageAccountListResult,
+    StorageAccountRegenerateKeyParameters,
+    StorageAccountUpdateParameters,
+    StorageSkuListResult,
+    TagProperty,
+    TrackedResource,
+    UpdateHistoryProperty,
+    Usage,
+    UsageListResult,
+    UsageName,
+    VirtualNetworkRule,
+)
+
+from ._storage_management_client_enums import (  # type: ignore
+    AccessTier,
+    AccountStatus,
+    Bypass,
+    CorsRuleAllowedMethodsItem,
+    DefaultAction,
+    Enum8,
+    GeoReplicationStatus,
+    HttpProtocol,
+    ImmutabilityPolicyState,
+    ImmutabilityPolicyUpdateType,
+    KeyPermission,
+    KeySource,
+    Kind,
+    LeaseContainerRequestAction,
+    LeaseDuration,
+    LeaseState,
+    LeaseStatus,
+    Permissions,
+    ProvisioningState,
+    PublicAccess,
+    Reason,
+    ReasonCode,
+    Services,
+    SignedResource,
+    SignedResourceTypes,
+    SkuName,
+    SkuTier,
+    State,
+    UsageUnit,
+)
 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__ = [
@@ -181,5 +192,5 @@
     "State",
     "UsageUnit",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/models/_models_py3.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/models/_models_py3.py
index 6839e4d3ee54..8962d0ab5477 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/models/_models_py3.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/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
 
 
@@ -191,7 +190,7 @@ def __init__(self, **kwargs: Any) -> None:
         self.etag = None
 
 
-class BlobContainer(AzureEntityResource):  # pylint: disable=too-many-instance-attributes
+class BlobContainer(AzureEntityResource):
     """Properties of the blob container, including Id, resource name, resource type, Etag.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -1032,7 +1031,7 @@ class LeaseContainerRequest(_serialization.Model):
     All required parameters must be populated in order to send to server.
 
     :ivar action: Specifies the lease action. Can be one of the available actions. Required. Known
-     values are: "Acquire", "Renew", "Change", "Release", and "Break".
+     values are: "Acquire", "Renew", "Change", "Release", "Break", and "Break".
     :vartype action: str or ~azure.mgmt.storage.v2018_07_01.models.LeaseContainerRequestAction
     :ivar lease_id: Identifies the lease. Can be specified in any valid GUID string format.
     :vartype lease_id: str
@@ -1071,7 +1070,7 @@ def __init__(
     ) -> None:
         """
         :keyword action: Specifies the lease action. Can be one of the available actions. Required.
-         Known values are: "Acquire", "Renew", "Change", "Release", and "Break".
+         Known values are: "Acquire", "Renew", "Change", "Release", "Break", and "Break".
         :paramtype action: str or ~azure.mgmt.storage.v2018_07_01.models.LeaseContainerRequestAction
         :keyword lease_id: Identifies the lease. Can be specified in any valid GUID string format.
         :paramtype lease_id: str
@@ -1217,7 +1216,7 @@ def __init__(self, **kwargs: Any) -> None:
         self.account_sas_token = None
 
 
-class ListContainerItem(AzureEntityResource):  # pylint: disable=too-many-instance-attributes
+class ListContainerItem(AzureEntityResource):
     """The blob container properties be listed out.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -1663,7 +1662,7 @@ def __init__(self, *, reason_code: Optional[Union[str, "_models.ReasonCode"]] =
         self.reason_code = reason_code
 
 
-class ServiceSasParameters(_serialization.Model):  # pylint: disable=too-many-instance-attributes
+class ServiceSasParameters(_serialization.Model):
     """The parameters to list service SAS credentials of a specific resource.
 
     All required parameters must be populated in order to send to server.
@@ -2008,7 +2007,7 @@ def __init__(self, *, location: str, tags: Optional[Dict[str, str]] = None, **kw
         self.location = location
 
 
-class StorageAccount(TrackedResource):  # pylint: disable=too-many-instance-attributes
+class StorageAccount(TrackedResource):
     """The storage account.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -2227,7 +2226,7 @@ def __init__(self, *, name: str, **kwargs: Any) -> None:
         self.name = name
 
 
-class StorageAccountCreateParameters(_serialization.Model):  # pylint: disable=too-many-instance-attributes
+class StorageAccountCreateParameters(_serialization.Model):
     """The parameters used when creating a storage account.
 
     All required parameters must be populated in order to send to server.
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/models/_storage_management_client_enums.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/models/_storage_management_client_enums.py
index a4e8084d989b..f7aef6752b0d 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/models/_storage_management_client_enums.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/models/_storage_management_client_enums.py
@@ -133,6 +133,7 @@ class LeaseContainerRequestAction(str, Enum, metaclass=CaseInsensitiveEnumMeta):
     RENEW = "Renew"
     CHANGE = "Change"
     RELEASE = "Release"
+    BREAK = "Break"
     BREAK_ENUM = "Break"
 
 
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/operations/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/operations/__init__.py
index d54538e70fca..2904c4bb3f14 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/operations/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/operations/__init__.py
@@ -5,16 +5,22 @@
 # Code generated by Microsoft (R) AutoRest Code Generator.
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
+# pylint: disable=wrong-import-position
 
-from ._operations import Operations
-from ._skus_operations import SkusOperations
-from ._storage_accounts_operations import StorageAccountsOperations
-from ._usages_operations import UsagesOperations
-from ._blob_services_operations import BlobServicesOperations
-from ._blob_containers_operations import BlobContainersOperations
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._operations import Operations  # type: ignore
+from ._skus_operations import SkusOperations  # type: ignore
+from ._storage_accounts_operations import StorageAccountsOperations  # type: ignore
+from ._usages_operations import UsagesOperations  # type: ignore
+from ._blob_services_operations import BlobServicesOperations  # type: ignore
+from ._blob_containers_operations import BlobContainersOperations  # type: ignore
 
 from ._patch import __all__ as _patch_all
-from ._patch import *  # pylint: disable=unused-wildcard-import
+from ._patch import *
 from ._patch import patch_sdk as _patch_sdk
 
 __all__ = [
@@ -25,5 +31,5 @@
     "BlobServicesOperations",
     "BlobContainersOperations",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/operations/_blob_containers_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/operations/_blob_containers_operations.py
index a3435967bdf7..eae8cb8878b8 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/operations/_blob_containers_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/operations/_blob_containers_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,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,
@@ -19,20 +19,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -573,7 +571,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
         :rtype: ~azure.mgmt.storage.v2018_07_01.models.ListContainerItems
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -595,7 +593,6 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -609,7 +606,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListContainerItems", pipeline_response)
+        deserialized = self._deserialize("ListContainerItems", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -722,7 +719,7 @@ def create(
         :rtype: ~azure.mgmt.storage.v2018_07_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -757,7 +754,6 @@ def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -771,7 +767,7 @@ def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -881,7 +877,7 @@ def update(
         :rtype: ~azure.mgmt.storage.v2018_07_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -916,7 +912,6 @@ def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -930,7 +925,7 @@ def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -959,7 +954,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2018_07_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -982,7 +977,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -996,7 +990,7 @@ def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1025,7 +1019,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,
@@ -1048,7 +1042,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1171,7 +1164,7 @@ def set_legal_hold(
         :rtype: ~azure.mgmt.storage.v2018_07_01.models.LegalHold
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1206,7 +1199,6 @@ def set_legal_hold(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1220,7 +1212,7 @@ def set_legal_hold(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LegalHold", pipeline_response)
+        deserialized = self._deserialize("LegalHold", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1330,7 +1322,7 @@ def clear_legal_hold(
         :rtype: ~azure.mgmt.storage.v2018_07_01.models.LegalHold
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1365,7 +1357,6 @@ def clear_legal_hold(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1379,7 +1370,7 @@ def clear_legal_hold(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LegalHold", pipeline_response)
+        deserialized = self._deserialize("LegalHold", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1518,7 +1509,7 @@ def create_or_update_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2018_07_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1558,7 +1549,6 @@ def create_or_update_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1575,7 +1565,7 @@ def create_or_update_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1618,7 +1608,7 @@ def get_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2018_07_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1643,7 +1633,6 @@ def get_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1660,7 +1649,7 @@ def get_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1705,7 +1694,7 @@ def delete_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2018_07_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1730,7 +1719,6 @@ def delete_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1747,7 +1735,7 @@ def delete_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1781,7 +1769,7 @@ def lock_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2018_07_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1805,7 +1793,6 @@ def lock_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1822,7 +1809,7 @@ def lock_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1952,7 +1939,7 @@ def extend_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2018_07_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1991,7 +1978,6 @@ def extend_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -2008,7 +1994,7 @@ def extend_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -2118,7 +2104,7 @@ def lease(
         :rtype: ~azure.mgmt.storage.v2018_07_01.models.LeaseContainerResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -2156,7 +2142,6 @@ def lease(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -2170,7 +2155,7 @@ def lease(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LeaseContainerResponse", pipeline_response)
+        deserialized = self._deserialize("LeaseContainerResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/operations/_blob_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/operations/_blob_services_operations.py
index 3604440e00b4..7c52f13e0ea4 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/operations/_blob_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/operations/_blob_services_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,
@@ -19,20 +18,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -239,7 +236,7 @@ def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2018_07_01.models.BlobServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -274,7 +271,6 @@ def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -288,7 +284,7 @@ def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobServiceProperties", pipeline_response)
+        deserialized = self._deserialize("BlobServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -316,7 +312,7 @@ def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2018_07_01.models.BlobServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -339,7 +335,6 @@ def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -353,7 +348,7 @@ def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobServiceProperties", pipeline_response)
+        deserialized = self._deserialize("BlobServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/operations/_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/operations/_operations.py
index 02ad24fd85b4..f203bc355991 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/operations/_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/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 (
@@ -20,20 +19,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -94,7 +91,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.Operation"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-07-01"))
         cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -110,7 +107,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -126,7 +122,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/operations/_skus_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/operations/_skus_operations.py
index 6afe4f9536eb..e0e18401c8eb 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/operations/_skus_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/operations/_skus_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 (
@@ -20,20 +19,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -99,7 +96,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.Sku"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-07-01"))
         cls: ClsType[_models.StorageSkuListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -116,7 +113,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -132,7 +128,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/operations/_storage_accounts_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/operations/_storage_accounts_operations.py
index f7d741a6c517..8f86a5b56c8e 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/operations/_storage_accounts_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/operations/_storage_accounts_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,7 @@
 # --------------------------------------------------------------------------
 from io import IOBase
 import sys
-from typing import Any, Callable, Dict, IO, Iterable, Literal, Optional, Type, TypeVar, Union, cast, overload
+from typing import Any, Callable, Dict, IO, Iterable, Iterator, Literal, Optional, TypeVar, Union, cast, overload
 import urllib.parse
 
 from azure.core.exceptions import (
@@ -17,13 +17,14 @@
     ResourceExistsError,
     ResourceNotFoundError,
     ResourceNotModifiedError,
+    StreamClosedError,
+    StreamConsumedError,
     map_error,
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
 from azure.core.polling import LROPoller, NoPolling, PollingMethod
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
@@ -31,12 +32,11 @@
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -512,7 +512,7 @@ def check_name_availability(
         :rtype: ~azure.mgmt.storage.v2018_07_01.models.CheckNameAvailabilityResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -544,7 +544,6 @@ def check_name_availability(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -558,7 +557,7 @@ def check_name_availability(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response)
+        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -571,8 +570,8 @@ def _create_initial(
         account_name: str,
         parameters: Union[_models.StorageAccountCreateParameters, IO[bytes]],
         **kwargs: Any
-    ) -> Optional[_models.StorageAccount]:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> Iterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -585,7 +584,7 @@ def _create_initial(
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-07-01"))
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
-        cls: ClsType[Optional[_models.StorageAccount]] = kwargs.pop("cls", None)
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
         _json = None
@@ -606,10 +605,10 @@ def _create_initial(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -617,12 +616,14 @@ def _create_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = None
-        if response.status_code == 200:
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -745,10 +746,11 @@ def begin_create(
                 params=_params,
                 **kwargs
             )
+            raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+            deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
             if cls:
                 return cls(pipeline_response, deserialized, {})  # type: ignore
             return deserialized
@@ -787,7 +789,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,
@@ -809,7 +811,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -853,7 +854,7 @@ def get_properties(
         :rtype: ~azure.mgmt.storage.v2018_07_01.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -876,7 +877,6 @@ def get_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -890,7 +890,7 @@ def get_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1001,7 +1001,7 @@ def update(
         :rtype: ~azure.mgmt.storage.v2018_07_01.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1035,7 +1035,6 @@ def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1049,7 +1048,7 @@ def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1071,7 +1070,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.StorageAccount"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-07-01"))
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1088,7 +1087,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -1104,7 +1102,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -1151,7 +1148,7 @@ def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> Ite
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-07-01"))
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1169,7 +1166,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -1185,7 +1181,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -1231,7 +1226,7 @@ def list_keys(
         :rtype: ~azure.mgmt.storage.v2018_07_01.models.StorageAccountListKeysResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1253,7 +1248,6 @@ def list_keys(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1267,7 +1261,7 @@ def list_keys(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response)
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1360,7 +1354,7 @@ def regenerate_key(
         :rtype: ~azure.mgmt.storage.v2018_07_01.models.StorageAccountListKeysResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1394,7 +1388,6 @@ def regenerate_key(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1408,7 +1401,7 @@ def regenerate_key(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response)
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1499,7 +1492,7 @@ def list_account_sas(
         :rtype: ~azure.mgmt.storage.v2018_07_01.models.ListAccountSasResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1533,7 +1526,6 @@ def list_account_sas(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1547,7 +1539,7 @@ def list_account_sas(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListAccountSasResponse", pipeline_response)
+        deserialized = self._deserialize("ListAccountSasResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1636,7 +1628,7 @@ def list_service_sas(
         :rtype: ~azure.mgmt.storage.v2018_07_01.models.ListServiceSasResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1670,7 +1662,6 @@ def list_service_sas(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1684,17 +1675,15 @@ def list_service_sas(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListServiceSasResponse", pipeline_response)
+        deserialized = self._deserialize("ListServiceSasResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
 
         return deserialized  # type: ignore
 
-    def _failover_initial(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, **kwargs: Any
-    ) -> None:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    def _failover_initial(self, resource_group_name: str, account_name: str, **kwargs: Any) -> Iterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1706,7 +1695,7 @@ def _failover_initial(  # pylint: disable=inconsistent-return-statements
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-07-01"))
-        cls: ClsType[None] = kwargs.pop("cls", None)
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
 
         _request = build_failover_request(
             resource_group_name=resource_group_name,
@@ -1716,10 +1705,10 @@ def _failover_initial(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -1727,11 +1716,19 @@ def _failover_initial(  # pylint: disable=inconsistent-return-statements
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
-            return cls(pipeline_response, None, {})  # type: ignore
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
 
     @distributed_trace
     def begin_failover(self, resource_group_name: str, account_name: str, **kwargs: Any) -> LROPoller[None]:
@@ -1759,7 +1756,7 @@ def begin_failover(self, resource_group_name: str, account_name: str, **kwargs:
         lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
         cont_token: Optional[str] = kwargs.pop("continuation_token", None)
         if cont_token is None:
-            raw_result = self._failover_initial(  # type: ignore
+            raw_result = self._failover_initial(
                 resource_group_name=resource_group_name,
                 account_name=account_name,
                 api_version=api_version,
@@ -1768,6 +1765,7 @@ def begin_failover(self, resource_group_name: str, account_name: str, **kwargs:
                 params=_params,
                 **kwargs
             )
+            raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/operations/_usages_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/operations/_usages_operations.py
index 2ec2533c4e11..a973a1eb6eca 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/operations/_usages_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_07_01/operations/_usages_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 (
@@ -20,20 +19,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -105,7 +102,7 @@ def list_by_location(self, location: str, **kwargs: Any) -> Iterable["_models.Us
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-07-01"))
         cls: ClsType[_models.UsageListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -123,7 +120,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -139,7 +135,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/__init__.py
index a860a5c185c9..60980065e1ee 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/__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 ._storage_management_client import StorageManagementClient
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._storage_management_client import StorageManagementClient  # 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__ = [
     "StorageManagementClient",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/_configuration.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/_configuration.py
index 784c1f2f9aa6..45ed9dbb1402 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/_configuration.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/_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 StorageManagementClientConfiguration:  # pylint: disable=too-many-instance-attributes,name-too-long
+class StorageManagementClientConfiguration:  # pylint: disable=too-many-instance-attributes
     """Configuration for StorageManagementClient.
 
     Note that all parameters used to create this instance are saved as instance
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/_metadata.json b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/_metadata.json
index 6a389ac15da5..fa4019e790cb 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/_metadata.json
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/_metadata.json
@@ -10,8 +10,8 @@
         "azure_arm": true,
         "has_public_lro_operations": true,
         "client_side_validation": false,
-        "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"ARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementClientConfiguration\"], \".._serialization\": [\"Deserializer\", \"Serializer\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}}",
-        "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"AsyncARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"AsyncARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementClientConfiguration\"], \"..._serialization\": [\"Deserializer\", \"Serializer\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"]}}}"
+        "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"ARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementClientConfiguration\"], \".._serialization\": [\"Deserializer\", \"Serializer\"]}, \"stdlib\": {\"typing_extensions\": [\"Self\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}}",
+        "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"AsyncARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"AsyncARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementClientConfiguration\"], \"..._serialization\": [\"Deserializer\", \"Serializer\"]}, \"stdlib\": {\"typing_extensions\": [\"Self\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"]}}}"
     },
     "global_parameters": {
         "sync": {
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/_storage_management_client.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/_storage_management_client.py
index 5e2e948134ab..7e9962ae03b6 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/_storage_management_client.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/_storage_management_client.py
@@ -8,6 +8,7 @@
 
 from copy import deepcopy
 from typing import Any, TYPE_CHECKING
+from typing_extensions import Self
 
 from azure.core.pipeline import policies
 from azure.core.rest import HttpRequest, HttpResponse
@@ -28,11 +29,10 @@
 )
 
 if TYPE_CHECKING:
-    # pylint: disable=unused-import,ungrouped-imports
     from azure.core.credentials import TokenCredential
 
 
-class StorageManagementClient:  # pylint: disable=client-accepts-api-version-keyword,too-many-instance-attributes
+class StorageManagementClient:  # pylint: disable=too-many-instance-attributes
     """The Azure Storage Management API.
 
     :ivar operations: Operations operations
@@ -138,7 +138,7 @@ def _send_request(self, request: HttpRequest, *, stream: bool = False, **kwargs:
     def close(self) -> None:
         self._client.close()
 
-    def __enter__(self) -> "StorageManagementClient":
+    def __enter__(self) -> Self:
         self._client.__enter__()
         return self
 
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/_vendor.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/_vendor.py
deleted file mode 100644
index 0dafe0e287ff..000000000000
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/_vendor.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# --------------------------------------------------------------------------
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License. See License.txt in the project root for license information.
-# Code generated by Microsoft (R) AutoRest Code Generator.
-# Changes may cause incorrect behavior and will be lost if the code is regenerated.
-# --------------------------------------------------------------------------
-
-from azure.core.pipeline.transport import HttpRequest
-
-
-def _convert_request(request, files=None):
-    data = request.content if not files else None
-    request = HttpRequest(method=request.method, url=request.url, headers=request.headers, data=data)
-    if files:
-        request.set_formdata_body(files)
-    return request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/_version.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/_version.py
index 83bf7bbed684..e5754a47ce68 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/_version.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/_version.py
@@ -6,4 +6,4 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-VERSION = "21.2.1"
+VERSION = "1.0.0b1"
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/aio/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/aio/__init__.py
index a5c3d2414cfd..ee2b940bd4fc 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/aio/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/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 ._storage_management_client import StorageManagementClient
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._storage_management_client import StorageManagementClient  # 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__ = [
     "StorageManagementClient",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/aio/_configuration.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/aio/_configuration.py
index 6bd238cf58cb..68f79136b75c 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/aio/_configuration.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/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 StorageManagementClientConfiguration:  # pylint: disable=too-many-instance-attributes,name-too-long
+class StorageManagementClientConfiguration:  # pylint: disable=too-many-instance-attributes
     """Configuration for StorageManagementClient.
 
     Note that all parameters used to create this instance are saved as instance
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/aio/_storage_management_client.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/aio/_storage_management_client.py
index ae9f4b66e9fc..ab191cc50cf3 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/aio/_storage_management_client.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/aio/_storage_management_client.py
@@ -8,6 +8,7 @@
 
 from copy import deepcopy
 from typing import Any, Awaitable, TYPE_CHECKING
+from typing_extensions import Self
 
 from azure.core.pipeline import policies
 from azure.core.rest import AsyncHttpResponse, HttpRequest
@@ -28,11 +29,10 @@
 )
 
 if TYPE_CHECKING:
-    # pylint: disable=unused-import,ungrouped-imports
     from azure.core.credentials_async import AsyncTokenCredential
 
 
-class StorageManagementClient:  # pylint: disable=client-accepts-api-version-keyword,too-many-instance-attributes
+class StorageManagementClient:  # pylint: disable=too-many-instance-attributes
     """The Azure Storage Management API.
 
     :ivar operations: Operations operations
@@ -142,7 +142,7 @@ def _send_request(
     async def close(self) -> None:
         await self._client.close()
 
-    async def __aenter__(self) -> "StorageManagementClient":
+    async def __aenter__(self) -> Self:
         await self._client.__aenter__()
         return self
 
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/aio/operations/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/aio/operations/__init__.py
index f845fcd0d9cb..a1c1461e660e 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/aio/operations/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/aio/operations/__init__.py
@@ -5,17 +5,23 @@
 # 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 ._skus_operations import SkusOperations
-from ._storage_accounts_operations import StorageAccountsOperations
-from ._usages_operations import UsagesOperations
-from ._management_policies_operations import ManagementPoliciesOperations
-from ._blob_services_operations import BlobServicesOperations
-from ._blob_containers_operations import BlobContainersOperations
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._operations import Operations  # type: ignore
+from ._skus_operations import SkusOperations  # type: ignore
+from ._storage_accounts_operations import StorageAccountsOperations  # type: ignore
+from ._usages_operations import UsagesOperations  # type: ignore
+from ._management_policies_operations import ManagementPoliciesOperations  # type: ignore
+from ._blob_services_operations import BlobServicesOperations  # type: ignore
+from ._blob_containers_operations import BlobContainersOperations  # 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__ = [
@@ -27,5 +33,5 @@
     "BlobServicesOperations",
     "BlobContainersOperations",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/aio/operations/_blob_containers_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/aio/operations/_blob_containers_operations.py
index aa39908d0905..4355eaccabce 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/aio/operations/_blob_containers_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/aio/operations/_blob_containers_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,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,
@@ -19,14 +19,12 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._blob_containers_operations import (
     build_clear_legal_hold_request,
     build_create_or_update_immutability_policy_request,
@@ -46,7 +44,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]]
 
@@ -87,7 +85,7 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
         :rtype: ~azure.mgmt.storage.v2018_11_01.models.ListContainerItems
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -109,7 +107,6 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -123,7 +120,7 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListContainerItems", pipeline_response)
+        deserialized = self._deserialize("ListContainerItems", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -236,7 +233,7 @@ async def create(
         :rtype: ~azure.mgmt.storage.v2018_11_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -271,7 +268,6 @@ async def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -285,11 +281,7 @@ async def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("BlobContainer", pipeline_response)
-
-        if response.status_code == 201:
-            deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -399,7 +391,7 @@ async def update(
         :rtype: ~azure.mgmt.storage.v2018_11_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -434,7 +426,6 @@ async def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -448,7 +439,7 @@ async def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -477,7 +468,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2018_11_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -500,7 +491,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -514,7 +504,7 @@ async def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -522,9 +512,7 @@ async def get(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, container_name: str, **kwargs: Any
-    ) -> None:
+    async def delete(self, resource_group_name: str, account_name: str, container_name: str, **kwargs: Any) -> None:
         """Deletes specified container under its account.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -543,7 +531,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,
@@ -566,7 +554,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -689,7 +676,7 @@ async def set_legal_hold(
         :rtype: ~azure.mgmt.storage.v2018_11_01.models.LegalHold
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -724,7 +711,6 @@ async def set_legal_hold(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -738,7 +724,7 @@ async def set_legal_hold(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LegalHold", pipeline_response)
+        deserialized = self._deserialize("LegalHold", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -848,7 +834,7 @@ async def clear_legal_hold(
         :rtype: ~azure.mgmt.storage.v2018_11_01.models.LegalHold
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -883,7 +869,6 @@ async def clear_legal_hold(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -897,7 +882,7 @@ async def clear_legal_hold(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LegalHold", pipeline_response)
+        deserialized = self._deserialize("LegalHold", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1036,7 +1021,7 @@ async def create_or_update_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2018_11_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1076,7 +1061,6 @@ async def create_or_update_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1093,7 +1077,7 @@ async def create_or_update_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1136,7 +1120,7 @@ async def get_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2018_11_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1161,7 +1145,6 @@ async def get_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1178,7 +1161,7 @@ async def get_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1223,7 +1206,7 @@ async def delete_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2018_11_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1248,7 +1231,6 @@ async def delete_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1265,7 +1247,7 @@ async def delete_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1299,7 +1281,7 @@ async def lock_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2018_11_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1323,7 +1305,6 @@ async def lock_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1340,7 +1321,7 @@ async def lock_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1470,7 +1451,7 @@ async def extend_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2018_11_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1509,7 +1490,6 @@ async def extend_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1526,7 +1506,7 @@ async def extend_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1636,7 +1616,7 @@ async def lease(
         :rtype: ~azure.mgmt.storage.v2018_11_01.models.LeaseContainerResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1674,7 +1654,6 @@ async def lease(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1688,7 +1667,7 @@ async def lease(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LeaseContainerResponse", pipeline_response)
+        deserialized = self._deserialize("LeaseContainerResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/aio/operations/_blob_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/aio/operations/_blob_services_operations.py
index b9af8078f408..1925f2b10ceb 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/aio/operations/_blob_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/aio/operations/_blob_services_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,
@@ -19,14 +18,12 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._blob_services_operations import (
     build_get_service_properties_request,
     build_set_service_properties_request,
@@ -35,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]]
 
@@ -160,7 +157,7 @@ async def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2018_11_01.models.BlobServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -195,7 +192,6 @@ async def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -209,7 +205,7 @@ async def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobServiceProperties", pipeline_response)
+        deserialized = self._deserialize("BlobServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -237,7 +233,7 @@ async def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2018_11_01.models.BlobServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -260,7 +256,6 @@ async def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -274,7 +269,7 @@ async def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobServiceProperties", pipeline_response)
+        deserialized = self._deserialize("BlobServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/aio/operations/_management_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/aio/operations/_management_policies_operations.py
index e3d3677624de..b68cefbc3c75 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/aio/operations/_management_policies_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/aio/operations/_management_policies_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,
@@ -19,14 +18,12 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._management_policies_operations import (
     build_create_or_update_request,
     build_delete_request,
@@ -36,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]]
 
@@ -86,7 +83,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2018_11_01.models.ManagementPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -109,7 +106,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -123,7 +119,7 @@ async def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ManagementPolicy", pipeline_response)
+        deserialized = self._deserialize("ManagementPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -227,7 +223,7 @@ async def create_or_update(
         :rtype: ~azure.mgmt.storage.v2018_11_01.models.ManagementPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -262,7 +258,6 @@ async def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -276,7 +271,7 @@ async def create_or_update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ManagementPolicy", pipeline_response)
+        deserialized = self._deserialize("ManagementPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -284,7 +279,7 @@ async def create_or_update(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
+    async def delete(
         self,
         resource_group_name: str,
         account_name: str,
@@ -308,7 +303,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,
@@ -331,7 +326,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/aio/operations/_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/aio/operations/_operations.py
index 593395db3ba5..28384b567ccf 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/aio/operations/_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/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
@@ -20,20 +19,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._operations import build_list_request
 
 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]]
 
@@ -73,7 +70,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.Operation"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-11-01"))
         cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -89,7 +86,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -105,7 +101,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/aio/operations/_skus_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/aio/operations/_skus_operations.py
index 8dedcbb34162..9102f46518f5 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/aio/operations/_skus_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/aio/operations/_skus_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
@@ -20,20 +19,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._skus_operations import build_list_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
 
@@ -72,7 +69,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.Sku"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-11-01"))
         cls: ClsType[_models.StorageSkuListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -89,7 +86,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -105,7 +101,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/aio/operations/_storage_accounts_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/aio/operations/_storage_accounts_operations.py
index 3fce40606370..355aed45f141 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/aio/operations/_storage_accounts_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/aio/operations/_storage_accounts_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,20 @@
 # --------------------------------------------------------------------------
 from io import IOBase
 import sys
-from typing import Any, AsyncIterable, Callable, Dict, IO, Literal, Optional, Type, TypeVar, Union, cast, overload
+from typing import (
+    Any,
+    AsyncIterable,
+    AsyncIterator,
+    Callable,
+    Dict,
+    IO,
+    Literal,
+    Optional,
+    TypeVar,
+    Union,
+    cast,
+    overload,
+)
 import urllib.parse
 
 from azure.core.async_paging import AsyncItemPaged, AsyncList
@@ -18,12 +31,13 @@
     ResourceExistsError,
     ResourceNotFoundError,
     ResourceNotModifiedError,
+    StreamClosedError,
+    StreamConsumedError,
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
 from azure.core.polling import AsyncLROPoller, AsyncNoPolling, AsyncPollingMethod
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
@@ -31,7 +45,6 @@
 from azure.mgmt.core.polling.async_arm_polling import AsyncARMPolling
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._storage_accounts_operations import (
     build_check_name_availability_request,
     build_create_request,
@@ -51,7 +64,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]]
 
@@ -134,7 +147,7 @@ async def check_name_availability(
         :rtype: ~azure.mgmt.storage.v2018_11_01.models.CheckNameAvailabilityResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -166,7 +179,6 @@ async def check_name_availability(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -180,7 +192,7 @@ async def check_name_availability(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response)
+        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -193,8 +205,8 @@ async def _create_initial(
         account_name: str,
         parameters: Union[_models.StorageAccountCreateParameters, IO[bytes]],
         **kwargs: Any
-    ) -> Optional[_models.StorageAccount]:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -207,7 +219,7 @@ async def _create_initial(
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-11-01"))
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
-        cls: ClsType[Optional[_models.StorageAccount]] = kwargs.pop("cls", None)
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
         _json = None
@@ -228,10 +240,10 @@ async def _create_initial(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -239,12 +251,14 @@ async def _create_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = None
-        if response.status_code == 200:
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -370,10 +384,11 @@ async def begin_create(
                 params=_params,
                 **kwargs
             )
+            await raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+            deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
             if cls:
                 return cls(pipeline_response, deserialized, {})  # type: ignore
             return deserialized
@@ -396,9 +411,7 @@ def get_long_running_output(pipeline_response):
         )
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, **kwargs: Any
-    ) -> None:
+    async def delete(self, resource_group_name: str, account_name: str, **kwargs: Any) -> None:
         """Deletes a storage account in Microsoft Azure.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -412,7 +425,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,
@@ -434,7 +447,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -478,7 +490,7 @@ async def get_properties(
         :rtype: ~azure.mgmt.storage.v2018_11_01.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -501,7 +513,6 @@ async def get_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -515,7 +526,7 @@ async def get_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -626,7 +637,7 @@ async def update(
         :rtype: ~azure.mgmt.storage.v2018_11_01.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -660,7 +671,6 @@ async def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -674,7 +684,7 @@ async def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -697,7 +707,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.StorageAccount"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-11-01"))
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -714,7 +724,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -730,7 +739,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -780,7 +788,7 @@ def list_by_resource_group(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-11-01"))
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -798,7 +806,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -814,7 +821,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -860,7 +866,7 @@ async def list_keys(
         :rtype: ~azure.mgmt.storage.v2018_11_01.models.StorageAccountListKeysResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -882,7 +888,6 @@ async def list_keys(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -896,7 +901,7 @@ async def list_keys(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response)
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -989,7 +994,7 @@ async def regenerate_key(
         :rtype: ~azure.mgmt.storage.v2018_11_01.models.StorageAccountListKeysResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1023,7 +1028,6 @@ async def regenerate_key(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1037,7 +1041,7 @@ async def regenerate_key(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response)
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1128,7 +1132,7 @@ async def list_account_sas(
         :rtype: ~azure.mgmt.storage.v2018_11_01.models.ListAccountSasResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1162,7 +1166,6 @@ async def list_account_sas(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1176,7 +1179,7 @@ async def list_account_sas(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListAccountSasResponse", pipeline_response)
+        deserialized = self._deserialize("ListAccountSasResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1265,7 +1268,7 @@ async def list_service_sas(
         :rtype: ~azure.mgmt.storage.v2018_11_01.models.ListServiceSasResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1299,7 +1302,6 @@ async def list_service_sas(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1313,17 +1315,17 @@ async def list_service_sas(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListServiceSasResponse", pipeline_response)
+        deserialized = self._deserialize("ListServiceSasResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
 
         return deserialized  # type: ignore
 
-    async def _failover_initial(  # pylint: disable=inconsistent-return-statements
+    async def _failover_initial(
         self, resource_group_name: str, account_name: str, **kwargs: Any
-    ) -> None:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1335,7 +1337,7 @@ async def _failover_initial(  # pylint: disable=inconsistent-return-statements
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-11-01"))
-        cls: ClsType[None] = kwargs.pop("cls", None)
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
 
         _request = build_failover_request(
             resource_group_name=resource_group_name,
@@ -1345,10 +1347,10 @@ async def _failover_initial(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -1356,11 +1358,19 @@ async def _failover_initial(  # pylint: disable=inconsistent-return-statements
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
-            return cls(pipeline_response, None, {})  # type: ignore
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
 
     @distributed_trace_async
     async def begin_failover(self, resource_group_name: str, account_name: str, **kwargs: Any) -> AsyncLROPoller[None]:
@@ -1388,7 +1398,7 @@ async def begin_failover(self, resource_group_name: str, account_name: str, **kw
         lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
         cont_token: Optional[str] = kwargs.pop("continuation_token", None)
         if cont_token is None:
-            raw_result = await self._failover_initial(  # type: ignore
+            raw_result = await self._failover_initial(
                 resource_group_name=resource_group_name,
                 account_name=account_name,
                 api_version=api_version,
@@ -1397,6 +1407,7 @@ async def begin_failover(self, resource_group_name: str, account_name: str, **kw
                 params=_params,
                 **kwargs
             )
+            await raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
@@ -1421,9 +1432,7 @@ def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-
         return AsyncLROPoller[None](self._client, raw_result, get_long_running_output, polling_method)  # type: ignore
 
     @distributed_trace_async
-    async def revoke_user_delegation_keys(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, **kwargs: Any
-    ) -> None:
+    async def revoke_user_delegation_keys(self, resource_group_name: str, account_name: str, **kwargs: Any) -> None:
         """Revoke user delegation keys.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -1437,7 +1446,7 @@ async def revoke_user_delegation_keys(  # pylint: disable=inconsistent-return-st
         :rtype: None
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1459,7 +1468,6 @@ async def revoke_user_delegation_keys(  # pylint: disable=inconsistent-return-st
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/aio/operations/_usages_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/aio/operations/_usages_operations.py
index 3c033e6eb509..4685ab84451a 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/aio/operations/_usages_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/aio/operations/_usages_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
@@ -20,20 +19,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._usages_operations import build_list_by_location_request
 
 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 +72,7 @@ def list_by_location(self, location: str, **kwargs: Any) -> AsyncIterable["_mode
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-11-01"))
         cls: ClsType[_models.UsageListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -93,7 +90,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -109,7 +105,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/models/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/models/__init__.py
index 42c6403995da..4467ef55006a 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/models/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/models/__init__.py
@@ -5,106 +5,117 @@
 # 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 AccountSasParameters
-from ._models_py3 import AzureEntityResource
-from ._models_py3 import BlobContainer
-from ._models_py3 import BlobServiceProperties
-from ._models_py3 import CheckNameAvailabilityResult
-from ._models_py3 import CorsRule
-from ._models_py3 import CorsRules
-from ._models_py3 import CustomDomain
-from ._models_py3 import DateAfterCreation
-from ._models_py3 import DateAfterModification
-from ._models_py3 import DeleteRetentionPolicy
-from ._models_py3 import Dimension
-from ._models_py3 import Encryption
-from ._models_py3 import EncryptionService
-from ._models_py3 import EncryptionServices
-from ._models_py3 import Endpoints
-from ._models_py3 import GeoReplicationStats
-from ._models_py3 import IPRule
-from ._models_py3 import Identity
-from ._models_py3 import ImmutabilityPolicy
-from ._models_py3 import ImmutabilityPolicyProperties
-from ._models_py3 import KeyVaultProperties
-from ._models_py3 import LeaseContainerRequest
-from ._models_py3 import LeaseContainerResponse
-from ._models_py3 import LegalHold
-from ._models_py3 import LegalHoldProperties
-from ._models_py3 import ListAccountSasResponse
-from ._models_py3 import ListContainerItem
-from ._models_py3 import ListContainerItems
-from ._models_py3 import ListServiceSasResponse
-from ._models_py3 import ManagementPolicy
-from ._models_py3 import ManagementPolicyAction
-from ._models_py3 import ManagementPolicyBaseBlob
-from ._models_py3 import ManagementPolicyDefinition
-from ._models_py3 import ManagementPolicyFilter
-from ._models_py3 import ManagementPolicyRule
-from ._models_py3 import ManagementPolicySchema
-from ._models_py3 import ManagementPolicySnapShot
-from ._models_py3 import MetricSpecification
-from ._models_py3 import NetworkRuleSet
-from ._models_py3 import Operation
-from ._models_py3 import OperationDisplay
-from ._models_py3 import OperationListResult
-from ._models_py3 import Resource
-from ._models_py3 import Restriction
-from ._models_py3 import SKUCapability
-from ._models_py3 import ServiceSasParameters
-from ._models_py3 import ServiceSpecification
-from ._models_py3 import Sku
-from ._models_py3 import StorageAccount
-from ._models_py3 import StorageAccountCheckNameAvailabilityParameters
-from ._models_py3 import StorageAccountCreateParameters
-from ._models_py3 import StorageAccountKey
-from ._models_py3 import StorageAccountListKeysResult
-from ._models_py3 import StorageAccountListResult
-from ._models_py3 import StorageAccountRegenerateKeyParameters
-from ._models_py3 import StorageAccountUpdateParameters
-from ._models_py3 import StorageSkuListResult
-from ._models_py3 import TagProperty
-from ._models_py3 import TrackedResource
-from ._models_py3 import UpdateHistoryProperty
-from ._models_py3 import Usage
-from ._models_py3 import UsageListResult
-from ._models_py3 import UsageName
-from ._models_py3 import VirtualNetworkRule
+from typing import TYPE_CHECKING
 
-from ._storage_management_client_enums import AccessTier
-from ._storage_management_client_enums import AccountStatus
-from ._storage_management_client_enums import Bypass
-from ._storage_management_client_enums import CorsRuleAllowedMethodsItem
-from ._storage_management_client_enums import DefaultAction
-from ._storage_management_client_enums import Enum10
-from ._storage_management_client_enums import GeoReplicationStatus
-from ._storage_management_client_enums import HttpProtocol
-from ._storage_management_client_enums import ImmutabilityPolicyState
-from ._storage_management_client_enums import ImmutabilityPolicyUpdateType
-from ._storage_management_client_enums import KeyPermission
-from ._storage_management_client_enums import KeySource
-from ._storage_management_client_enums import Kind
-from ._storage_management_client_enums import LeaseContainerRequestAction
-from ._storage_management_client_enums import LeaseDuration
-from ._storage_management_client_enums import LeaseState
-from ._storage_management_client_enums import LeaseStatus
-from ._storage_management_client_enums import ManagementPolicyName
-from ._storage_management_client_enums import Permissions
-from ._storage_management_client_enums import ProvisioningState
-from ._storage_management_client_enums import PublicAccess
-from ._storage_management_client_enums import Reason
-from ._storage_management_client_enums import ReasonCode
-from ._storage_management_client_enums import RuleType
-from ._storage_management_client_enums import Services
-from ._storage_management_client_enums import SignedResource
-from ._storage_management_client_enums import SignedResourceTypes
-from ._storage_management_client_enums import SkuName
-from ._storage_management_client_enums import SkuTier
-from ._storage_management_client_enums import State
-from ._storage_management_client_enums import UsageUnit
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+
+from ._models_py3 import (  # type: ignore
+    AccountSasParameters,
+    AzureEntityResource,
+    BlobContainer,
+    BlobServiceProperties,
+    CheckNameAvailabilityResult,
+    CorsRule,
+    CorsRules,
+    CustomDomain,
+    DateAfterCreation,
+    DateAfterModification,
+    DeleteRetentionPolicy,
+    Dimension,
+    Encryption,
+    EncryptionService,
+    EncryptionServices,
+    Endpoints,
+    GeoReplicationStats,
+    IPRule,
+    Identity,
+    ImmutabilityPolicy,
+    ImmutabilityPolicyProperties,
+    KeyVaultProperties,
+    LeaseContainerRequest,
+    LeaseContainerResponse,
+    LegalHold,
+    LegalHoldProperties,
+    ListAccountSasResponse,
+    ListContainerItem,
+    ListContainerItems,
+    ListServiceSasResponse,
+    ManagementPolicy,
+    ManagementPolicyAction,
+    ManagementPolicyBaseBlob,
+    ManagementPolicyDefinition,
+    ManagementPolicyFilter,
+    ManagementPolicyRule,
+    ManagementPolicySchema,
+    ManagementPolicySnapShot,
+    MetricSpecification,
+    NetworkRuleSet,
+    Operation,
+    OperationDisplay,
+    OperationListResult,
+    Resource,
+    Restriction,
+    SKUCapability,
+    ServiceSasParameters,
+    ServiceSpecification,
+    Sku,
+    StorageAccount,
+    StorageAccountCheckNameAvailabilityParameters,
+    StorageAccountCreateParameters,
+    StorageAccountKey,
+    StorageAccountListKeysResult,
+    StorageAccountListResult,
+    StorageAccountRegenerateKeyParameters,
+    StorageAccountUpdateParameters,
+    StorageSkuListResult,
+    TagProperty,
+    TrackedResource,
+    UpdateHistoryProperty,
+    Usage,
+    UsageListResult,
+    UsageName,
+    VirtualNetworkRule,
+)
+
+from ._storage_management_client_enums import (  # type: ignore
+    AccessTier,
+    AccountStatus,
+    Bypass,
+    CorsRuleAllowedMethodsItem,
+    DefaultAction,
+    Enum10,
+    GeoReplicationStatus,
+    HttpProtocol,
+    ImmutabilityPolicyState,
+    ImmutabilityPolicyUpdateType,
+    KeyPermission,
+    KeySource,
+    Kind,
+    LeaseContainerRequestAction,
+    LeaseDuration,
+    LeaseState,
+    LeaseStatus,
+    ManagementPolicyName,
+    Permissions,
+    ProvisioningState,
+    PublicAccess,
+    Reason,
+    ReasonCode,
+    RuleType,
+    Services,
+    SignedResource,
+    SignedResourceTypes,
+    SkuName,
+    SkuTier,
+    State,
+    UsageUnit,
+)
 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__ = [
@@ -205,5 +216,5 @@
     "State",
     "UsageUnit",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/models/_models_py3.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/models/_models_py3.py
index 82eae1af04b6..aab6b43060e4 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/models/_models_py3.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/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
 
 
@@ -191,7 +190,7 @@ def __init__(self, **kwargs: Any) -> None:
         self.etag = None
 
 
-class BlobContainer(AzureEntityResource):  # pylint: disable=too-many-instance-attributes
+class BlobContainer(AzureEntityResource):
     """Properties of the blob container, including Id, resource name, resource type, Etag.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -1088,7 +1087,7 @@ class LeaseContainerRequest(_serialization.Model):
     All required parameters must be populated in order to send to server.
 
     :ivar action: Specifies the lease action. Can be one of the available actions. Required. Known
-     values are: "Acquire", "Renew", "Change", "Release", and "Break".
+     values are: "Acquire", "Renew", "Change", "Release", "Break", and "Break".
     :vartype action: str or ~azure.mgmt.storage.v2018_11_01.models.LeaseContainerRequestAction
     :ivar lease_id: Identifies the lease. Can be specified in any valid GUID string format.
     :vartype lease_id: str
@@ -1127,7 +1126,7 @@ def __init__(
     ) -> None:
         """
         :keyword action: Specifies the lease action. Can be one of the available actions. Required.
-         Known values are: "Acquire", "Renew", "Change", "Release", and "Break".
+         Known values are: "Acquire", "Renew", "Change", "Release", "Break", and "Break".
         :paramtype action: str or ~azure.mgmt.storage.v2018_11_01.models.LeaseContainerRequestAction
         :keyword lease_id: Identifies the lease. Can be specified in any valid GUID string format.
         :paramtype lease_id: str
@@ -1273,7 +1272,7 @@ def __init__(self, **kwargs: Any) -> None:
         self.account_sas_token = None
 
 
-class ListContainerItem(AzureEntityResource):  # pylint: disable=too-many-instance-attributes
+class ListContainerItem(AzureEntityResource):
     """The blob container properties be listed out.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -2019,7 +2018,7 @@ def __init__(self, *, reason_code: Optional[Union[str, "_models.ReasonCode"]] =
         self.reason_code = reason_code
 
 
-class ServiceSasParameters(_serialization.Model):  # pylint: disable=too-many-instance-attributes
+class ServiceSasParameters(_serialization.Model):
     """The parameters to list service SAS credentials of a specific resource.
 
     All required parameters must be populated in order to send to server.
@@ -2364,7 +2363,7 @@ def __init__(self, *, location: str, tags: Optional[Dict[str, str]] = None, **kw
         self.location = location
 
 
-class StorageAccount(TrackedResource):  # pylint: disable=too-many-instance-attributes
+class StorageAccount(TrackedResource):
     """The storage account.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -2583,7 +2582,7 @@ def __init__(self, *, name: str, **kwargs: Any) -> None:
         self.name = name
 
 
-class StorageAccountCreateParameters(_serialization.Model):  # pylint: disable=too-many-instance-attributes
+class StorageAccountCreateParameters(_serialization.Model):
     """The parameters used when creating a storage account.
 
     All required parameters must be populated in order to send to server.
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/models/_storage_management_client_enums.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/models/_storage_management_client_enums.py
index a1076c70bcec..355726683af8 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/models/_storage_management_client_enums.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/models/_storage_management_client_enums.py
@@ -133,6 +133,7 @@ class LeaseContainerRequestAction(str, Enum, metaclass=CaseInsensitiveEnumMeta):
     RENEW = "Renew"
     CHANGE = "Change"
     RELEASE = "Release"
+    BREAK = "Break"
     BREAK_ENUM = "Break"
 
 
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/operations/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/operations/__init__.py
index f845fcd0d9cb..a1c1461e660e 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/operations/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/operations/__init__.py
@@ -5,17 +5,23 @@
 # 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 ._skus_operations import SkusOperations
-from ._storage_accounts_operations import StorageAccountsOperations
-from ._usages_operations import UsagesOperations
-from ._management_policies_operations import ManagementPoliciesOperations
-from ._blob_services_operations import BlobServicesOperations
-from ._blob_containers_operations import BlobContainersOperations
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._operations import Operations  # type: ignore
+from ._skus_operations import SkusOperations  # type: ignore
+from ._storage_accounts_operations import StorageAccountsOperations  # type: ignore
+from ._usages_operations import UsagesOperations  # type: ignore
+from ._management_policies_operations import ManagementPoliciesOperations  # type: ignore
+from ._blob_services_operations import BlobServicesOperations  # type: ignore
+from ._blob_containers_operations import BlobContainersOperations  # 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__ = [
@@ -27,5 +33,5 @@
     "BlobServicesOperations",
     "BlobContainersOperations",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/operations/_blob_containers_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/operations/_blob_containers_operations.py
index 3de7fa1159e8..f33a041a9cce 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/operations/_blob_containers_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/operations/_blob_containers_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,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,
@@ -19,20 +19,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -573,7 +571,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
         :rtype: ~azure.mgmt.storage.v2018_11_01.models.ListContainerItems
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -595,7 +593,6 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -609,7 +606,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListContainerItems", pipeline_response)
+        deserialized = self._deserialize("ListContainerItems", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -722,7 +719,7 @@ def create(
         :rtype: ~azure.mgmt.storage.v2018_11_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -757,7 +754,6 @@ def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -771,11 +767,7 @@ def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("BlobContainer", pipeline_response)
-
-        if response.status_code == 201:
-            deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -885,7 +877,7 @@ def update(
         :rtype: ~azure.mgmt.storage.v2018_11_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -920,7 +912,6 @@ def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -934,7 +925,7 @@ def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -963,7 +954,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2018_11_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -986,7 +977,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1000,7 +990,7 @@ def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1029,7 +1019,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,
@@ -1052,7 +1042,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1175,7 +1164,7 @@ def set_legal_hold(
         :rtype: ~azure.mgmt.storage.v2018_11_01.models.LegalHold
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1210,7 +1199,6 @@ def set_legal_hold(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1224,7 +1212,7 @@ def set_legal_hold(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LegalHold", pipeline_response)
+        deserialized = self._deserialize("LegalHold", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1334,7 +1322,7 @@ def clear_legal_hold(
         :rtype: ~azure.mgmt.storage.v2018_11_01.models.LegalHold
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1369,7 +1357,6 @@ def clear_legal_hold(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1383,7 +1370,7 @@ def clear_legal_hold(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LegalHold", pipeline_response)
+        deserialized = self._deserialize("LegalHold", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1522,7 +1509,7 @@ def create_or_update_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2018_11_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1562,7 +1549,6 @@ def create_or_update_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1579,7 +1565,7 @@ def create_or_update_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1622,7 +1608,7 @@ def get_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2018_11_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1647,7 +1633,6 @@ def get_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1664,7 +1649,7 @@ def get_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1709,7 +1694,7 @@ def delete_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2018_11_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1734,7 +1719,6 @@ def delete_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1751,7 +1735,7 @@ def delete_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1785,7 +1769,7 @@ def lock_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2018_11_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1809,7 +1793,6 @@ def lock_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1826,7 +1809,7 @@ def lock_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1956,7 +1939,7 @@ def extend_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2018_11_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1995,7 +1978,6 @@ def extend_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -2012,7 +1994,7 @@ def extend_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -2122,7 +2104,7 @@ def lease(
         :rtype: ~azure.mgmt.storage.v2018_11_01.models.LeaseContainerResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -2160,7 +2142,6 @@ def lease(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -2174,7 +2155,7 @@ def lease(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LeaseContainerResponse", pipeline_response)
+        deserialized = self._deserialize("LeaseContainerResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/operations/_blob_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/operations/_blob_services_operations.py
index c852b93ed4e2..9835d18d5874 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/operations/_blob_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/operations/_blob_services_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,
@@ -19,20 +18,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -239,7 +236,7 @@ def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2018_11_01.models.BlobServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -274,7 +271,6 @@ def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -288,7 +284,7 @@ def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobServiceProperties", pipeline_response)
+        deserialized = self._deserialize("BlobServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -316,7 +312,7 @@ def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2018_11_01.models.BlobServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -339,7 +335,6 @@ def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -353,7 +348,7 @@ def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobServiceProperties", pipeline_response)
+        deserialized = self._deserialize("BlobServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/operations/_management_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/operations/_management_policies_operations.py
index 9e3f037e3537..8c3347da2859 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/operations/_management_policies_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/operations/_management_policies_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,
@@ -19,20 +18,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -196,7 +193,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2018_11_01.models.ManagementPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -219,7 +216,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -233,7 +229,7 @@ def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ManagementPolicy", pipeline_response)
+        deserialized = self._deserialize("ManagementPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -337,7 +333,7 @@ def create_or_update(
         :rtype: ~azure.mgmt.storage.v2018_11_01.models.ManagementPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -372,7 +368,6 @@ def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -386,7 +381,7 @@ def create_or_update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ManagementPolicy", pipeline_response)
+        deserialized = self._deserialize("ManagementPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -418,7 +413,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,
@@ -441,7 +436,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/operations/_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/operations/_operations.py
index 2411b127983d..545c727f9eca 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/operations/_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/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 (
@@ -20,20 +19,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -94,7 +91,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.Operation"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-11-01"))
         cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -110,7 +107,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -126,7 +122,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/operations/_skus_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/operations/_skus_operations.py
index c75566ad2528..ea1b67675c21 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/operations/_skus_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/operations/_skus_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 (
@@ -20,20 +19,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -99,7 +96,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.Sku"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-11-01"))
         cls: ClsType[_models.StorageSkuListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -116,7 +113,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -132,7 +128,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/operations/_storage_accounts_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/operations/_storage_accounts_operations.py
index cfb196d19cff..fdc5ec5783ef 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/operations/_storage_accounts_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/operations/_storage_accounts_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,7 @@
 # --------------------------------------------------------------------------
 from io import IOBase
 import sys
-from typing import Any, Callable, Dict, IO, Iterable, Literal, Optional, Type, TypeVar, Union, cast, overload
+from typing import Any, Callable, Dict, IO, Iterable, Iterator, Literal, Optional, TypeVar, Union, cast, overload
 import urllib.parse
 
 from azure.core.exceptions import (
@@ -17,13 +17,14 @@
     ResourceExistsError,
     ResourceNotFoundError,
     ResourceNotModifiedError,
+    StreamClosedError,
+    StreamConsumedError,
     map_error,
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
 from azure.core.polling import LROPoller, NoPolling, PollingMethod
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
@@ -31,12 +32,11 @@
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -539,7 +539,7 @@ def check_name_availability(
         :rtype: ~azure.mgmt.storage.v2018_11_01.models.CheckNameAvailabilityResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -571,7 +571,6 @@ def check_name_availability(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -585,7 +584,7 @@ def check_name_availability(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response)
+        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -598,8 +597,8 @@ def _create_initial(
         account_name: str,
         parameters: Union[_models.StorageAccountCreateParameters, IO[bytes]],
         **kwargs: Any
-    ) -> Optional[_models.StorageAccount]:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> Iterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -612,7 +611,7 @@ def _create_initial(
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-11-01"))
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
-        cls: ClsType[Optional[_models.StorageAccount]] = kwargs.pop("cls", None)
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
         _json = None
@@ -633,10 +632,10 @@ def _create_initial(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -644,12 +643,14 @@ def _create_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = None
-        if response.status_code == 200:
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -772,10 +773,11 @@ def begin_create(
                 params=_params,
                 **kwargs
             )
+            raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+            deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
             if cls:
                 return cls(pipeline_response, deserialized, {})  # type: ignore
             return deserialized
@@ -814,7 +816,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,
@@ -836,7 +838,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -880,7 +881,7 @@ def get_properties(
         :rtype: ~azure.mgmt.storage.v2018_11_01.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -903,7 +904,6 @@ def get_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -917,7 +917,7 @@ def get_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1028,7 +1028,7 @@ def update(
         :rtype: ~azure.mgmt.storage.v2018_11_01.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1062,7 +1062,6 @@ def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1076,7 +1075,7 @@ def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1098,7 +1097,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.StorageAccount"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-11-01"))
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1115,7 +1114,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -1131,7 +1129,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -1178,7 +1175,7 @@ def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> Ite
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-11-01"))
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1196,7 +1193,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -1212,7 +1208,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -1258,7 +1253,7 @@ def list_keys(
         :rtype: ~azure.mgmt.storage.v2018_11_01.models.StorageAccountListKeysResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1280,7 +1275,6 @@ def list_keys(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1294,7 +1288,7 @@ def list_keys(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response)
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1387,7 +1381,7 @@ def regenerate_key(
         :rtype: ~azure.mgmt.storage.v2018_11_01.models.StorageAccountListKeysResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1421,7 +1415,6 @@ def regenerate_key(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1435,7 +1428,7 @@ def regenerate_key(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response)
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1526,7 +1519,7 @@ def list_account_sas(
         :rtype: ~azure.mgmt.storage.v2018_11_01.models.ListAccountSasResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1560,7 +1553,6 @@ def list_account_sas(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1574,7 +1566,7 @@ def list_account_sas(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListAccountSasResponse", pipeline_response)
+        deserialized = self._deserialize("ListAccountSasResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1663,7 +1655,7 @@ def list_service_sas(
         :rtype: ~azure.mgmt.storage.v2018_11_01.models.ListServiceSasResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1697,7 +1689,6 @@ def list_service_sas(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1711,17 +1702,15 @@ def list_service_sas(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListServiceSasResponse", pipeline_response)
+        deserialized = self._deserialize("ListServiceSasResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
 
         return deserialized  # type: ignore
 
-    def _failover_initial(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, **kwargs: Any
-    ) -> None:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    def _failover_initial(self, resource_group_name: str, account_name: str, **kwargs: Any) -> Iterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1733,7 +1722,7 @@ def _failover_initial(  # pylint: disable=inconsistent-return-statements
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-11-01"))
-        cls: ClsType[None] = kwargs.pop("cls", None)
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
 
         _request = build_failover_request(
             resource_group_name=resource_group_name,
@@ -1743,10 +1732,10 @@ def _failover_initial(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -1754,11 +1743,19 @@ def _failover_initial(  # pylint: disable=inconsistent-return-statements
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
-            return cls(pipeline_response, None, {})  # type: ignore
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
 
     @distributed_trace
     def begin_failover(self, resource_group_name: str, account_name: str, **kwargs: Any) -> LROPoller[None]:
@@ -1786,7 +1783,7 @@ def begin_failover(self, resource_group_name: str, account_name: str, **kwargs:
         lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
         cont_token: Optional[str] = kwargs.pop("continuation_token", None)
         if cont_token is None:
-            raw_result = self._failover_initial(  # type: ignore
+            raw_result = self._failover_initial(
                 resource_group_name=resource_group_name,
                 account_name=account_name,
                 api_version=api_version,
@@ -1795,6 +1792,7 @@ def begin_failover(self, resource_group_name: str, account_name: str, **kwargs:
                 params=_params,
                 **kwargs
             )
+            raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
@@ -1835,7 +1833,7 @@ def revoke_user_delegation_keys(  # pylint: disable=inconsistent-return-statemen
         :rtype: None
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1857,7 +1855,6 @@ def revoke_user_delegation_keys(  # pylint: disable=inconsistent-return-statemen
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/operations/_usages_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/operations/_usages_operations.py
index 1aa7af3489cb..632880ca794b 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/operations/_usages_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2018_11_01/operations/_usages_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 (
@@ -20,20 +19,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -105,7 +102,7 @@ def list_by_location(self, location: str, **kwargs: Any) -> Iterable["_models.Us
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2018-11-01"))
         cls: ClsType[_models.UsageListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -123,7 +120,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -139,7 +135,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/__init__.py
index a860a5c185c9..60980065e1ee 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/__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 ._storage_management_client import StorageManagementClient
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._storage_management_client import StorageManagementClient  # 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__ = [
     "StorageManagementClient",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/_configuration.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/_configuration.py
index 2d275656dfc0..83c2a903722c 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/_configuration.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/_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 StorageManagementClientConfiguration:  # pylint: disable=too-many-instance-attributes,name-too-long
+class StorageManagementClientConfiguration:  # pylint: disable=too-many-instance-attributes
     """Configuration for StorageManagementClient.
 
     Note that all parameters used to create this instance are saved as instance
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/_metadata.json b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/_metadata.json
index c47a92dae63d..d20a34625dcd 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/_metadata.json
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/_metadata.json
@@ -10,8 +10,8 @@
         "azure_arm": true,
         "has_public_lro_operations": true,
         "client_side_validation": false,
-        "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"ARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementClientConfiguration\"], \".._serialization\": [\"Deserializer\", \"Serializer\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}}",
-        "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"AsyncARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"AsyncARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementClientConfiguration\"], \"..._serialization\": [\"Deserializer\", \"Serializer\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"]}}}"
+        "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"ARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementClientConfiguration\"], \".._serialization\": [\"Deserializer\", \"Serializer\"]}, \"stdlib\": {\"typing_extensions\": [\"Self\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}}",
+        "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"AsyncARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"AsyncARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementClientConfiguration\"], \"..._serialization\": [\"Deserializer\", \"Serializer\"]}, \"stdlib\": {\"typing_extensions\": [\"Self\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"]}}}"
     },
     "global_parameters": {
         "sync": {
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/_storage_management_client.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/_storage_management_client.py
index 4af127947d76..934c34d5c378 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/_storage_management_client.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/_storage_management_client.py
@@ -8,6 +8,7 @@
 
 from copy import deepcopy
 from typing import Any, TYPE_CHECKING
+from typing_extensions import Self
 
 from azure.core.pipeline import policies
 from azure.core.rest import HttpRequest, HttpResponse
@@ -30,11 +31,10 @@
 )
 
 if TYPE_CHECKING:
-    # pylint: disable=unused-import,ungrouped-imports
     from azure.core.credentials import TokenCredential
 
 
-class StorageManagementClient:  # pylint: disable=client-accepts-api-version-keyword,too-many-instance-attributes
+class StorageManagementClient:  # pylint: disable=too-many-instance-attributes
     """The Azure Storage Management API.
 
     :ivar operations: Operations operations
@@ -150,7 +150,7 @@ def _send_request(self, request: HttpRequest, *, stream: bool = False, **kwargs:
     def close(self) -> None:
         self._client.close()
 
-    def __enter__(self) -> "StorageManagementClient":
+    def __enter__(self) -> Self:
         self._client.__enter__()
         return self
 
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/_vendor.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/_vendor.py
deleted file mode 100644
index 0dafe0e287ff..000000000000
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/_vendor.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# --------------------------------------------------------------------------
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License. See License.txt in the project root for license information.
-# Code generated by Microsoft (R) AutoRest Code Generator.
-# Changes may cause incorrect behavior and will be lost if the code is regenerated.
-# --------------------------------------------------------------------------
-
-from azure.core.pipeline.transport import HttpRequest
-
-
-def _convert_request(request, files=None):
-    data = request.content if not files else None
-    request = HttpRequest(method=request.method, url=request.url, headers=request.headers, data=data)
-    if files:
-        request.set_formdata_body(files)
-    return request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/_version.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/_version.py
index 5a163c0afedc..e5754a47ce68 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/_version.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/_version.py
@@ -6,4 +6,4 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-VERSION = "21.2.1"
\ No newline at end of file
+VERSION = "1.0.0b1"
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/aio/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/aio/__init__.py
index a5c3d2414cfd..ee2b940bd4fc 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/aio/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/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 ._storage_management_client import StorageManagementClient
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._storage_management_client import StorageManagementClient  # 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__ = [
     "StorageManagementClient",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/aio/_configuration.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/aio/_configuration.py
index 2977f0428576..901c5cab0ec6 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/aio/_configuration.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/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 StorageManagementClientConfiguration:  # pylint: disable=too-many-instance-attributes,name-too-long
+class StorageManagementClientConfiguration:  # pylint: disable=too-many-instance-attributes
     """Configuration for StorageManagementClient.
 
     Note that all parameters used to create this instance are saved as instance
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/aio/_storage_management_client.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/aio/_storage_management_client.py
index 26736d3aec15..1a5f04d627e4 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/aio/_storage_management_client.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/aio/_storage_management_client.py
@@ -8,6 +8,7 @@
 
 from copy import deepcopy
 from typing import Any, Awaitable, TYPE_CHECKING
+from typing_extensions import Self
 
 from azure.core.pipeline import policies
 from azure.core.rest import AsyncHttpResponse, HttpRequest
@@ -30,11 +31,10 @@
 )
 
 if TYPE_CHECKING:
-    # pylint: disable=unused-import,ungrouped-imports
     from azure.core.credentials_async import AsyncTokenCredential
 
 
-class StorageManagementClient:  # pylint: disable=client-accepts-api-version-keyword,too-many-instance-attributes
+class StorageManagementClient:  # pylint: disable=too-many-instance-attributes
     """The Azure Storage Management API.
 
     :ivar operations: Operations operations
@@ -154,7 +154,7 @@ def _send_request(
     async def close(self) -> None:
         await self._client.close()
 
-    async def __aenter__(self) -> "StorageManagementClient":
+    async def __aenter__(self) -> Self:
         await self._client.__aenter__()
         return self
 
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/aio/operations/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/aio/operations/__init__.py
index 7a2c350acc25..226bb54cc4f5 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/aio/operations/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/aio/operations/__init__.py
@@ -5,19 +5,25 @@
 # 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 ._skus_operations import SkusOperations
-from ._storage_accounts_operations import StorageAccountsOperations
-from ._usages_operations import UsagesOperations
-from ._management_policies_operations import ManagementPoliciesOperations
-from ._blob_services_operations import BlobServicesOperations
-from ._blob_containers_operations import BlobContainersOperations
-from ._file_services_operations import FileServicesOperations
-from ._file_shares_operations import FileSharesOperations
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._operations import Operations  # type: ignore
+from ._skus_operations import SkusOperations  # type: ignore
+from ._storage_accounts_operations import StorageAccountsOperations  # type: ignore
+from ._usages_operations import UsagesOperations  # type: ignore
+from ._management_policies_operations import ManagementPoliciesOperations  # type: ignore
+from ._blob_services_operations import BlobServicesOperations  # type: ignore
+from ._blob_containers_operations import BlobContainersOperations  # type: ignore
+from ._file_services_operations import FileServicesOperations  # type: ignore
+from ._file_shares_operations import FileSharesOperations  # 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__ = [
@@ -31,5 +37,5 @@
     "FileServicesOperations",
     "FileSharesOperations",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/aio/operations/_blob_containers_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/aio/operations/_blob_containers_operations.py
index 3348249ed922..fd4c0bfbbd2e 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/aio/operations/_blob_containers_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/aio/operations/_blob_containers_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,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
@@ -21,15 +21,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._blob_containers_operations import (
     build_clear_legal_hold_request,
     build_create_or_update_immutability_policy_request,
@@ -49,7 +47,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]]
 
@@ -113,7 +111,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-04-01"))
         cls: ClsType[_models.ListContainerItems] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -135,7 +133,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -151,7 +148,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -286,7 +282,7 @@ async def create(
         :rtype: ~azure.mgmt.storage.v2019_04_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -321,7 +317,6 @@ async def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -335,11 +330,7 @@ async def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("BlobContainer", pipeline_response)
-
-        if response.status_code == 201:
-            deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -449,7 +440,7 @@ async def update(
         :rtype: ~azure.mgmt.storage.v2019_04_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -484,7 +475,6 @@ async def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -498,7 +488,7 @@ async def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -527,7 +517,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2019_04_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -550,7 +540,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -564,7 +553,7 @@ async def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -572,9 +561,7 @@ async def get(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, container_name: str, **kwargs: Any
-    ) -> None:
+    async def delete(self, resource_group_name: str, account_name: str, container_name: str, **kwargs: Any) -> None:
         """Deletes specified container under its account.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -593,7 +580,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,
@@ -616,7 +603,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -739,7 +725,7 @@ async def set_legal_hold(
         :rtype: ~azure.mgmt.storage.v2019_04_01.models.LegalHold
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -774,7 +760,6 @@ async def set_legal_hold(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -788,7 +773,7 @@ async def set_legal_hold(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LegalHold", pipeline_response)
+        deserialized = self._deserialize("LegalHold", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -898,7 +883,7 @@ async def clear_legal_hold(
         :rtype: ~azure.mgmt.storage.v2019_04_01.models.LegalHold
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -933,7 +918,6 @@ async def clear_legal_hold(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -947,7 +931,7 @@ async def clear_legal_hold(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LegalHold", pipeline_response)
+        deserialized = self._deserialize("LegalHold", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1086,7 +1070,7 @@ async def create_or_update_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2019_04_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1126,7 +1110,6 @@ async def create_or_update_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1143,7 +1126,7 @@ async def create_or_update_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1186,7 +1169,7 @@ async def get_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2019_04_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1211,7 +1194,6 @@ async def get_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1228,7 +1210,7 @@ async def get_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1273,7 +1255,7 @@ async def delete_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2019_04_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1298,7 +1280,6 @@ async def delete_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1315,7 +1296,7 @@ async def delete_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1349,7 +1330,7 @@ async def lock_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2019_04_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1373,7 +1354,6 @@ async def lock_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1390,7 +1370,7 @@ async def lock_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1520,7 +1500,7 @@ async def extend_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2019_04_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1559,7 +1539,6 @@ async def extend_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1576,7 +1555,7 @@ async def extend_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1686,7 +1665,7 @@ async def lease(
         :rtype: ~azure.mgmt.storage.v2019_04_01.models.LeaseContainerResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1724,7 +1703,6 @@ async def lease(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1738,7 +1716,7 @@ async def lease(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LeaseContainerResponse", pipeline_response)
+        deserialized = self._deserialize("LeaseContainerResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/aio/operations/_blob_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/aio/operations/_blob_services_operations.py
index 53725ce113f4..f222e1a76d18 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/aio/operations/_blob_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/aio/operations/_blob_services_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._blob_services_operations import (
     build_get_service_properties_request,
     build_list_request,
@@ -39,7 +36,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 +86,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-04-01"))
         cls: ClsType[_models.BlobServiceItems] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -108,7 +105,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -124,7 +120,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -253,7 +248,7 @@ async def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2019_04_01.models.BlobServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -288,7 +283,6 @@ async def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -302,7 +296,7 @@ async def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobServiceProperties", pipeline_response)
+        deserialized = self._deserialize("BlobServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -330,7 +324,7 @@ async def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2019_04_01.models.BlobServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -353,7 +347,6 @@ async def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -367,7 +360,7 @@ async def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobServiceProperties", pipeline_response)
+        deserialized = self._deserialize("BlobServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/aio/operations/_file_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/aio/operations/_file_services_operations.py
index ca5cd13b1b1b..ea9f4b6f9461 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/aio/operations/_file_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/aio/operations/_file_services_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,
@@ -19,14 +18,12 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._file_services_operations import (
     build_get_service_properties_request,
     build_list_request,
@@ -36,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]]
 
@@ -76,7 +73,7 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
         :rtype: ~azure.mgmt.storage.v2019_04_01.models.FileServiceItems
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -98,7 +95,6 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -112,7 +108,7 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileServiceItems", pipeline_response)
+        deserialized = self._deserialize("FileServiceItems", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -219,7 +215,7 @@ async def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2019_04_01.models.FileServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -254,7 +250,6 @@ async def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -268,7 +263,7 @@ async def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileServiceProperties", pipeline_response)
+        deserialized = self._deserialize("FileServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -296,7 +291,7 @@ async def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2019_04_01.models.FileServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -319,7 +314,6 @@ async def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -333,7 +327,7 @@ async def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileServiceProperties", pipeline_response)
+        deserialized = self._deserialize("FileServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/aio/operations/_file_shares_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/aio/operations/_file_shares_operations.py
index fe3eceb971d9..8d88f41a8bcf 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/aio/operations/_file_shares_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/aio/operations/_file_shares_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._file_shares_operations import (
     build_create_request,
     build_delete_request,
@@ -41,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]]
 
@@ -104,7 +101,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-04-01"))
         cls: ClsType[_models.FileShareItems] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -126,7 +123,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -142,7 +138,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -277,7 +272,7 @@ async def create(
         :rtype: ~azure.mgmt.storage.v2019_04_01.models.FileShare
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -312,7 +307,6 @@ async def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -326,11 +320,7 @@ async def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("FileShare", pipeline_response)
-
-        if response.status_code == 201:
-            deserialized = self._deserialize("FileShare", pipeline_response)
+        deserialized = self._deserialize("FileShare", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -440,7 +430,7 @@ async def update(
         :rtype: ~azure.mgmt.storage.v2019_04_01.models.FileShare
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -475,7 +465,6 @@ async def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -489,7 +478,7 @@ async def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileShare", pipeline_response)
+        deserialized = self._deserialize("FileShare", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -518,7 +507,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2019_04_01.models.FileShare
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -541,7 +530,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -555,7 +543,7 @@ async def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileShare", pipeline_response)
+        deserialized = self._deserialize("FileShare", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -563,9 +551,7 @@ async def get(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, share_name: str, **kwargs: Any
-    ) -> None:
+    async def delete(self, resource_group_name: str, account_name: str, share_name: str, **kwargs: Any) -> None:
         """Deletes specified share under its account.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -584,7 +570,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,
@@ -607,7 +593,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/aio/operations/_management_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/aio/operations/_management_policies_operations.py
index 840d15da6708..eae106b4fcfa 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/aio/operations/_management_policies_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/aio/operations/_management_policies_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,
@@ -19,14 +18,12 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._management_policies_operations import (
     build_create_or_update_request,
     build_delete_request,
@@ -36,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]]
 
@@ -86,7 +83,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2019_04_01.models.ManagementPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -109,7 +106,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -123,7 +119,7 @@ async def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ManagementPolicy", pipeline_response)
+        deserialized = self._deserialize("ManagementPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -227,7 +223,7 @@ async def create_or_update(
         :rtype: ~azure.mgmt.storage.v2019_04_01.models.ManagementPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -262,7 +258,6 @@ async def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -276,7 +271,7 @@ async def create_or_update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ManagementPolicy", pipeline_response)
+        deserialized = self._deserialize("ManagementPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -284,7 +279,7 @@ async def create_or_update(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
+    async def delete(
         self,
         resource_group_name: str,
         account_name: str,
@@ -308,7 +303,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,
@@ -331,7 +326,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/aio/operations/_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/aio/operations/_operations.py
index a1d7a4986eb6..11973862324a 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/aio/operations/_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/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
@@ -20,20 +19,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._operations import build_list_request
 
 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]]
 
@@ -73,7 +70,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.Operation"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-04-01"))
         cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -89,7 +86,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -105,7 +101,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/aio/operations/_skus_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/aio/operations/_skus_operations.py
index ac61431cb4af..659f8531761f 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/aio/operations/_skus_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/aio/operations/_skus_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
@@ -20,20 +19,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._skus_operations import build_list_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
 
@@ -72,7 +69,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.Sku"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-04-01"))
         cls: ClsType[_models.StorageSkuListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -89,7 +86,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -105,7 +101,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/aio/operations/_storage_accounts_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/aio/operations/_storage_accounts_operations.py
index 281947b2a6b3..e393b4106b8d 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/aio/operations/_storage_accounts_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/aio/operations/_storage_accounts_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,20 @@
 # --------------------------------------------------------------------------
 from io import IOBase
 import sys
-from typing import Any, AsyncIterable, Callable, Dict, IO, Literal, Optional, Type, TypeVar, Union, cast, overload
+from typing import (
+    Any,
+    AsyncIterable,
+    AsyncIterator,
+    Callable,
+    Dict,
+    IO,
+    Literal,
+    Optional,
+    TypeVar,
+    Union,
+    cast,
+    overload,
+)
 import urllib.parse
 
 from azure.core.async_paging import AsyncItemPaged, AsyncList
@@ -18,12 +31,13 @@
     ResourceExistsError,
     ResourceNotFoundError,
     ResourceNotModifiedError,
+    StreamClosedError,
+    StreamConsumedError,
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
 from azure.core.polling import AsyncLROPoller, AsyncNoPolling, AsyncPollingMethod
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
@@ -31,7 +45,6 @@
 from azure.mgmt.core.polling.async_arm_polling import AsyncARMPolling
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._storage_accounts_operations import (
     build_check_name_availability_request,
     build_create_request,
@@ -51,7 +64,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]]
 
@@ -134,7 +147,7 @@ async def check_name_availability(
         :rtype: ~azure.mgmt.storage.v2019_04_01.models.CheckNameAvailabilityResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -166,7 +179,6 @@ async def check_name_availability(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -180,7 +192,7 @@ async def check_name_availability(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response)
+        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -193,8 +205,8 @@ async def _create_initial(
         account_name: str,
         parameters: Union[_models.StorageAccountCreateParameters, IO[bytes]],
         **kwargs: Any
-    ) -> Optional[_models.StorageAccount]:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -207,7 +219,7 @@ async def _create_initial(
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-04-01"))
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
-        cls: ClsType[Optional[_models.StorageAccount]] = kwargs.pop("cls", None)
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
         _json = None
@@ -228,10 +240,10 @@ async def _create_initial(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -239,12 +251,14 @@ async def _create_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = None
-        if response.status_code == 200:
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -370,10 +384,11 @@ async def begin_create(
                 params=_params,
                 **kwargs
             )
+            await raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+            deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
             if cls:
                 return cls(pipeline_response, deserialized, {})  # type: ignore
             return deserialized
@@ -396,9 +411,7 @@ def get_long_running_output(pipeline_response):
         )
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, **kwargs: Any
-    ) -> None:
+    async def delete(self, resource_group_name: str, account_name: str, **kwargs: Any) -> None:
         """Deletes a storage account in Microsoft Azure.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -412,7 +425,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,
@@ -434,7 +447,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -478,7 +490,7 @@ async def get_properties(
         :rtype: ~azure.mgmt.storage.v2019_04_01.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -501,7 +513,6 @@ async def get_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -515,7 +526,7 @@ async def get_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -626,7 +637,7 @@ async def update(
         :rtype: ~azure.mgmt.storage.v2019_04_01.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -660,7 +671,6 @@ async def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -674,7 +684,7 @@ async def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -697,7 +707,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.StorageAccount"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-04-01"))
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -714,7 +724,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -730,7 +739,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -780,7 +788,7 @@ def list_by_resource_group(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-04-01"))
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -798,7 +806,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -814,7 +821,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -864,7 +870,7 @@ async def list_keys(
         :rtype: ~azure.mgmt.storage.v2019_04_01.models.StorageAccountListKeysResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -887,7 +893,6 @@ async def list_keys(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -901,7 +906,7 @@ async def list_keys(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response)
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -995,7 +1000,7 @@ async def regenerate_key(
         :rtype: ~azure.mgmt.storage.v2019_04_01.models.StorageAccountListKeysResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1029,7 +1034,6 @@ async def regenerate_key(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1043,7 +1047,7 @@ async def regenerate_key(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response)
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1134,7 +1138,7 @@ async def list_account_sas(
         :rtype: ~azure.mgmt.storage.v2019_04_01.models.ListAccountSasResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1168,7 +1172,6 @@ async def list_account_sas(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1182,7 +1185,7 @@ async def list_account_sas(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListAccountSasResponse", pipeline_response)
+        deserialized = self._deserialize("ListAccountSasResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1271,7 +1274,7 @@ async def list_service_sas(
         :rtype: ~azure.mgmt.storage.v2019_04_01.models.ListServiceSasResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1305,7 +1308,6 @@ async def list_service_sas(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1319,17 +1321,17 @@ async def list_service_sas(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListServiceSasResponse", pipeline_response)
+        deserialized = self._deserialize("ListServiceSasResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
 
         return deserialized  # type: ignore
 
-    async def _failover_initial(  # pylint: disable=inconsistent-return-statements
+    async def _failover_initial(
         self, resource_group_name: str, account_name: str, **kwargs: Any
-    ) -> None:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1341,7 +1343,7 @@ async def _failover_initial(  # pylint: disable=inconsistent-return-statements
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-04-01"))
-        cls: ClsType[None] = kwargs.pop("cls", None)
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
 
         _request = build_failover_request(
             resource_group_name=resource_group_name,
@@ -1351,10 +1353,10 @@ async def _failover_initial(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -1362,11 +1364,19 @@ async def _failover_initial(  # pylint: disable=inconsistent-return-statements
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
-            return cls(pipeline_response, None, {})  # type: ignore
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
 
     @distributed_trace_async
     async def begin_failover(self, resource_group_name: str, account_name: str, **kwargs: Any) -> AsyncLROPoller[None]:
@@ -1394,7 +1404,7 @@ async def begin_failover(self, resource_group_name: str, account_name: str, **kw
         lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
         cont_token: Optional[str] = kwargs.pop("continuation_token", None)
         if cont_token is None:
-            raw_result = await self._failover_initial(  # type: ignore
+            raw_result = await self._failover_initial(
                 resource_group_name=resource_group_name,
                 account_name=account_name,
                 api_version=api_version,
@@ -1403,6 +1413,7 @@ async def begin_failover(self, resource_group_name: str, account_name: str, **kw
                 params=_params,
                 **kwargs
             )
+            await raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
@@ -1427,9 +1438,7 @@ def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-
         return AsyncLROPoller[None](self._client, raw_result, get_long_running_output, polling_method)  # type: ignore
 
     @distributed_trace_async
-    async def revoke_user_delegation_keys(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, **kwargs: Any
-    ) -> None:
+    async def revoke_user_delegation_keys(self, resource_group_name: str, account_name: str, **kwargs: Any) -> None:
         """Revoke user delegation keys.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -1443,7 +1452,7 @@ async def revoke_user_delegation_keys(  # pylint: disable=inconsistent-return-st
         :rtype: None
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1465,7 +1474,6 @@ async def revoke_user_delegation_keys(  # pylint: disable=inconsistent-return-st
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/aio/operations/_usages_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/aio/operations/_usages_operations.py
index 8adaeeafa210..e707dc23a91e 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/aio/operations/_usages_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/aio/operations/_usages_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
@@ -20,20 +19,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._usages_operations import build_list_by_location_request
 
 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 +72,7 @@ def list_by_location(self, location: str, **kwargs: Any) -> AsyncIterable["_mode
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-04-01"))
         cls: ClsType[_models.UsageListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -93,7 +90,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -109,7 +105,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/models/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/models/__init__.py
index 168dcf6868dd..45389b878421 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/models/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/models/__init__.py
@@ -5,119 +5,130 @@
 # 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 AccountSasParameters
-from ._models_py3 import ActiveDirectoryProperties
-from ._models_py3 import AzureEntityResource
-from ._models_py3 import AzureFilesIdentityBasedAuthentication
-from ._models_py3 import BlobContainer
-from ._models_py3 import BlobServiceItems
-from ._models_py3 import BlobServiceProperties
-from ._models_py3 import ChangeFeed
-from ._models_py3 import CheckNameAvailabilityResult
-from ._models_py3 import CloudErrorBody
-from ._models_py3 import CorsRule
-from ._models_py3 import CorsRules
-from ._models_py3 import CustomDomain
-from ._models_py3 import DateAfterCreation
-from ._models_py3 import DateAfterModification
-from ._models_py3 import DeleteRetentionPolicy
-from ._models_py3 import Dimension
-from ._models_py3 import Encryption
-from ._models_py3 import EncryptionService
-from ._models_py3 import EncryptionServices
-from ._models_py3 import Endpoints
-from ._models_py3 import FileServiceItems
-from ._models_py3 import FileServiceProperties
-from ._models_py3 import FileShare
-from ._models_py3 import FileShareItem
-from ._models_py3 import FileShareItems
-from ._models_py3 import GeoReplicationStats
-from ._models_py3 import IPRule
-from ._models_py3 import Identity
-from ._models_py3 import ImmutabilityPolicy
-from ._models_py3 import ImmutabilityPolicyProperties
-from ._models_py3 import KeyVaultProperties
-from ._models_py3 import LeaseContainerRequest
-from ._models_py3 import LeaseContainerResponse
-from ._models_py3 import LegalHold
-from ._models_py3 import LegalHoldProperties
-from ._models_py3 import ListAccountSasResponse
-from ._models_py3 import ListContainerItem
-from ._models_py3 import ListContainerItems
-from ._models_py3 import ListServiceSasResponse
-from ._models_py3 import ManagementPolicy
-from ._models_py3 import ManagementPolicyAction
-from ._models_py3 import ManagementPolicyBaseBlob
-from ._models_py3 import ManagementPolicyDefinition
-from ._models_py3 import ManagementPolicyFilter
-from ._models_py3 import ManagementPolicyRule
-from ._models_py3 import ManagementPolicySchema
-from ._models_py3 import ManagementPolicySnapShot
-from ._models_py3 import MetricSpecification
-from ._models_py3 import NetworkRuleSet
-from ._models_py3 import Operation
-from ._models_py3 import OperationDisplay
-from ._models_py3 import OperationListResult
-from ._models_py3 import Resource
-from ._models_py3 import Restriction
-from ._models_py3 import SKUCapability
-from ._models_py3 import ServiceSasParameters
-from ._models_py3 import ServiceSpecification
-from ._models_py3 import Sku
-from ._models_py3 import StorageAccount
-from ._models_py3 import StorageAccountCheckNameAvailabilityParameters
-from ._models_py3 import StorageAccountCreateParameters
-from ._models_py3 import StorageAccountKey
-from ._models_py3 import StorageAccountListKeysResult
-from ._models_py3 import StorageAccountListResult
-from ._models_py3 import StorageAccountRegenerateKeyParameters
-from ._models_py3 import StorageAccountUpdateParameters
-from ._models_py3 import StorageSkuListResult
-from ._models_py3 import TagProperty
-from ._models_py3 import TrackedResource
-from ._models_py3 import UpdateHistoryProperty
-from ._models_py3 import Usage
-from ._models_py3 import UsageListResult
-from ._models_py3 import UsageName
-from ._models_py3 import VirtualNetworkRule
+from typing import TYPE_CHECKING
 
-from ._storage_management_client_enums import AccessTier
-from ._storage_management_client_enums import AccountStatus
-from ._storage_management_client_enums import Bypass
-from ._storage_management_client_enums import CorsRuleAllowedMethodsItem
-from ._storage_management_client_enums import DefaultAction
-from ._storage_management_client_enums import DirectoryServiceOptions
-from ._storage_management_client_enums import Enum16
-from ._storage_management_client_enums import GeoReplicationStatus
-from ._storage_management_client_enums import HttpProtocol
-from ._storage_management_client_enums import ImmutabilityPolicyState
-from ._storage_management_client_enums import ImmutabilityPolicyUpdateType
-from ._storage_management_client_enums import KeyPermission
-from ._storage_management_client_enums import KeySource
-from ._storage_management_client_enums import Kind
-from ._storage_management_client_enums import LargeFileSharesState
-from ._storage_management_client_enums import LeaseContainerRequestAction
-from ._storage_management_client_enums import LeaseDuration
-from ._storage_management_client_enums import LeaseState
-from ._storage_management_client_enums import LeaseStatus
-from ._storage_management_client_enums import ManagementPolicyName
-from ._storage_management_client_enums import MinimumTlsVersion
-from ._storage_management_client_enums import Permissions
-from ._storage_management_client_enums import ProvisioningState
-from ._storage_management_client_enums import PublicAccess
-from ._storage_management_client_enums import Reason
-from ._storage_management_client_enums import ReasonCode
-from ._storage_management_client_enums import RuleType
-from ._storage_management_client_enums import Services
-from ._storage_management_client_enums import SignedResource
-from ._storage_management_client_enums import SignedResourceTypes
-from ._storage_management_client_enums import SkuName
-from ._storage_management_client_enums import SkuTier
-from ._storage_management_client_enums import State
-from ._storage_management_client_enums import UsageUnit
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+
+from ._models_py3 import (  # type: ignore
+    AccountSasParameters,
+    ActiveDirectoryProperties,
+    AzureEntityResource,
+    AzureFilesIdentityBasedAuthentication,
+    BlobContainer,
+    BlobServiceItems,
+    BlobServiceProperties,
+    ChangeFeed,
+    CheckNameAvailabilityResult,
+    CloudErrorBody,
+    CorsRule,
+    CorsRules,
+    CustomDomain,
+    DateAfterCreation,
+    DateAfterModification,
+    DeleteRetentionPolicy,
+    Dimension,
+    Encryption,
+    EncryptionService,
+    EncryptionServices,
+    Endpoints,
+    FileServiceItems,
+    FileServiceProperties,
+    FileShare,
+    FileShareItem,
+    FileShareItems,
+    GeoReplicationStats,
+    IPRule,
+    Identity,
+    ImmutabilityPolicy,
+    ImmutabilityPolicyProperties,
+    KeyVaultProperties,
+    LeaseContainerRequest,
+    LeaseContainerResponse,
+    LegalHold,
+    LegalHoldProperties,
+    ListAccountSasResponse,
+    ListContainerItem,
+    ListContainerItems,
+    ListServiceSasResponse,
+    ManagementPolicy,
+    ManagementPolicyAction,
+    ManagementPolicyBaseBlob,
+    ManagementPolicyDefinition,
+    ManagementPolicyFilter,
+    ManagementPolicyRule,
+    ManagementPolicySchema,
+    ManagementPolicySnapShot,
+    MetricSpecification,
+    NetworkRuleSet,
+    Operation,
+    OperationDisplay,
+    OperationListResult,
+    Resource,
+    Restriction,
+    SKUCapability,
+    ServiceSasParameters,
+    ServiceSpecification,
+    Sku,
+    StorageAccount,
+    StorageAccountCheckNameAvailabilityParameters,
+    StorageAccountCreateParameters,
+    StorageAccountKey,
+    StorageAccountListKeysResult,
+    StorageAccountListResult,
+    StorageAccountRegenerateKeyParameters,
+    StorageAccountUpdateParameters,
+    StorageSkuListResult,
+    TagProperty,
+    TrackedResource,
+    UpdateHistoryProperty,
+    Usage,
+    UsageListResult,
+    UsageName,
+    VirtualNetworkRule,
+)
+
+from ._storage_management_client_enums import (  # type: ignore
+    AccessTier,
+    AccountStatus,
+    Bypass,
+    CorsRuleAllowedMethodsItem,
+    DefaultAction,
+    DirectoryServiceOptions,
+    Enum16,
+    GeoReplicationStatus,
+    HttpProtocol,
+    ImmutabilityPolicyState,
+    ImmutabilityPolicyUpdateType,
+    KeyPermission,
+    KeySource,
+    Kind,
+    LargeFileSharesState,
+    LeaseContainerRequestAction,
+    LeaseDuration,
+    LeaseState,
+    LeaseStatus,
+    ManagementPolicyName,
+    MinimumTlsVersion,
+    Permissions,
+    ProvisioningState,
+    PublicAccess,
+    Reason,
+    ReasonCode,
+    RuleType,
+    Services,
+    SignedResource,
+    SignedResourceTypes,
+    SkuName,
+    SkuTier,
+    State,
+    UsageUnit,
+)
 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__ = [
@@ -231,5 +242,5 @@
     "State",
     "UsageUnit",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/models/_models_py3.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/models/_models_py3.py
index eb7740eaf82c..e37f5b482883 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/models/_models_py3.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/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
 
 
@@ -309,7 +308,7 @@ def __init__(
         self.active_directory_properties = active_directory_properties
 
 
-class BlobContainer(AzureEntityResource):  # pylint: disable=too-many-instance-attributes
+class BlobContainer(AzureEntityResource):
     """Properties of the blob container, including Id, resource name, resource type, Etag.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -1529,7 +1528,7 @@ class LeaseContainerRequest(_serialization.Model):
     All required parameters must be populated in order to send to server.
 
     :ivar action: Specifies the lease action. Can be one of the available actions. Required. Known
-     values are: "Acquire", "Renew", "Change", "Release", and "Break".
+     values are: "Acquire", "Renew", "Change", "Release", "Break", and "Break".
     :vartype action: str or ~azure.mgmt.storage.v2019_04_01.models.LeaseContainerRequestAction
     :ivar lease_id: Identifies the lease. Can be specified in any valid GUID string format.
     :vartype lease_id: str
@@ -1568,7 +1567,7 @@ def __init__(
     ) -> None:
         """
         :keyword action: Specifies the lease action. Can be one of the available actions. Required.
-         Known values are: "Acquire", "Renew", "Change", "Release", and "Break".
+         Known values are: "Acquire", "Renew", "Change", "Release", "Break", and "Break".
         :paramtype action: str or ~azure.mgmt.storage.v2019_04_01.models.LeaseContainerRequestAction
         :keyword lease_id: Identifies the lease. Can be specified in any valid GUID string format.
         :paramtype lease_id: str
@@ -1714,7 +1713,7 @@ def __init__(self, **kwargs: Any) -> None:
         self.account_sas_token = None
 
 
-class ListContainerItem(AzureEntityResource):  # pylint: disable=too-many-instance-attributes
+class ListContainerItem(AzureEntityResource):
     """The blob container properties be listed out.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -2470,7 +2469,7 @@ def __init__(self, *, reason_code: Optional[Union[str, "_models.ReasonCode"]] =
         self.reason_code = reason_code
 
 
-class ServiceSasParameters(_serialization.Model):  # pylint: disable=too-many-instance-attributes
+class ServiceSasParameters(_serialization.Model):
     """The parameters to list service SAS credentials of a specific resource.
 
     All required parameters must be populated in order to send to server.
@@ -2815,7 +2814,7 @@ def __init__(self, *, location: str, tags: Optional[Dict[str, str]] = None, **kw
         self.location = location
 
 
-class StorageAccount(TrackedResource):  # pylint: disable=too-many-instance-attributes
+class StorageAccount(TrackedResource):
     """The storage account.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -3083,7 +3082,7 @@ def __init__(self, *, name: str, **kwargs: Any) -> None:
         self.name = name
 
 
-class StorageAccountCreateParameters(_serialization.Model):  # pylint: disable=too-many-instance-attributes
+class StorageAccountCreateParameters(_serialization.Model):
     """The parameters used when creating a storage account.
 
     All required parameters must be populated in order to send to server.
@@ -3383,7 +3382,7 @@ def __init__(self, *, key_name: str, **kwargs: Any) -> None:
         self.key_name = key_name
 
 
-class StorageAccountUpdateParameters(_serialization.Model):  # pylint: disable=too-many-instance-attributes
+class StorageAccountUpdateParameters(_serialization.Model):
     """The parameters that can be provided when updating the storage account properties.
 
     :ivar sku: Gets or sets the SKU name. Note that the SKU name cannot be updated to Standard_ZRS,
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/models/_storage_management_client_enums.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/models/_storage_management_client_enums.py
index d2f96238f31a..987f92f35b12 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/models/_storage_management_client_enums.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/models/_storage_management_client_enums.py
@@ -148,6 +148,7 @@ class LeaseContainerRequestAction(str, Enum, metaclass=CaseInsensitiveEnumMeta):
     RENEW = "Renew"
     CHANGE = "Change"
     RELEASE = "Release"
+    BREAK = "Break"
     BREAK_ENUM = "Break"
 
 
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/operations/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/operations/__init__.py
index 7a2c350acc25..226bb54cc4f5 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/operations/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/operations/__init__.py
@@ -5,19 +5,25 @@
 # 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 ._skus_operations import SkusOperations
-from ._storage_accounts_operations import StorageAccountsOperations
-from ._usages_operations import UsagesOperations
-from ._management_policies_operations import ManagementPoliciesOperations
-from ._blob_services_operations import BlobServicesOperations
-from ._blob_containers_operations import BlobContainersOperations
-from ._file_services_operations import FileServicesOperations
-from ._file_shares_operations import FileSharesOperations
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._operations import Operations  # type: ignore
+from ._skus_operations import SkusOperations  # type: ignore
+from ._storage_accounts_operations import StorageAccountsOperations  # type: ignore
+from ._usages_operations import UsagesOperations  # type: ignore
+from ._management_policies_operations import ManagementPoliciesOperations  # type: ignore
+from ._blob_services_operations import BlobServicesOperations  # type: ignore
+from ._blob_containers_operations import BlobContainersOperations  # type: ignore
+from ._file_services_operations import FileServicesOperations  # type: ignore
+from ._file_shares_operations import FileSharesOperations  # 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__ = [
@@ -31,5 +37,5 @@
     "FileServicesOperations",
     "FileSharesOperations",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/operations/_blob_containers_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/operations/_blob_containers_operations.py
index 22f6942d6b1b..269afead38ce 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/operations/_blob_containers_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/operations/_blob_containers_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,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 (
@@ -21,20 +21,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -612,7 +610,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-04-01"))
         cls: ClsType[_models.ListContainerItems] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -634,7 +632,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -650,7 +647,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -785,7 +781,7 @@ def create(
         :rtype: ~azure.mgmt.storage.v2019_04_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -820,7 +816,6 @@ def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -834,11 +829,7 @@ def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("BlobContainer", pipeline_response)
-
-        if response.status_code == 201:
-            deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -948,7 +939,7 @@ def update(
         :rtype: ~azure.mgmt.storage.v2019_04_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -983,7 +974,6 @@ def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -997,7 +987,7 @@ def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1026,7 +1016,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2019_04_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1049,7 +1039,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1063,7 +1052,7 @@ def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1092,7 +1081,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,
@@ -1115,7 +1104,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1238,7 +1226,7 @@ def set_legal_hold(
         :rtype: ~azure.mgmt.storage.v2019_04_01.models.LegalHold
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1273,7 +1261,6 @@ def set_legal_hold(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1287,7 +1274,7 @@ def set_legal_hold(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LegalHold", pipeline_response)
+        deserialized = self._deserialize("LegalHold", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1397,7 +1384,7 @@ def clear_legal_hold(
         :rtype: ~azure.mgmt.storage.v2019_04_01.models.LegalHold
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1432,7 +1419,6 @@ def clear_legal_hold(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1446,7 +1432,7 @@ def clear_legal_hold(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LegalHold", pipeline_response)
+        deserialized = self._deserialize("LegalHold", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1585,7 +1571,7 @@ def create_or_update_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2019_04_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1625,7 +1611,6 @@ def create_or_update_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1642,7 +1627,7 @@ def create_or_update_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1685,7 +1670,7 @@ def get_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2019_04_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1710,7 +1695,6 @@ def get_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1727,7 +1711,7 @@ def get_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1772,7 +1756,7 @@ def delete_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2019_04_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1797,7 +1781,6 @@ def delete_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1814,7 +1797,7 @@ def delete_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1848,7 +1831,7 @@ def lock_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2019_04_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1872,7 +1855,6 @@ def lock_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1889,7 +1871,7 @@ def lock_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -2019,7 +2001,7 @@ def extend_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2019_04_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -2058,7 +2040,6 @@ def extend_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -2075,7 +2056,7 @@ def extend_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -2185,7 +2166,7 @@ def lease(
         :rtype: ~azure.mgmt.storage.v2019_04_01.models.LeaseContainerResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -2223,7 +2204,6 @@ def lease(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -2237,7 +2217,7 @@ def lease(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LeaseContainerResponse", pipeline_response)
+        deserialized = self._deserialize("LeaseContainerResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/operations/_blob_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/operations/_blob_services_operations.py
index 9f47cc8752c6..19e89c87023a 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/operations/_blob_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/operations/_blob_services_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 (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -197,7 +194,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-04-01"))
         cls: ClsType[_models.BlobServiceItems] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -216,7 +213,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -232,7 +228,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -361,7 +356,7 @@ def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2019_04_01.models.BlobServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -396,7 +391,6 @@ def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -410,7 +404,7 @@ def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobServiceProperties", pipeline_response)
+        deserialized = self._deserialize("BlobServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -438,7 +432,7 @@ def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2019_04_01.models.BlobServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -461,7 +455,6 @@ def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -475,7 +468,7 @@ def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobServiceProperties", pipeline_response)
+        deserialized = self._deserialize("BlobServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/operations/_file_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/operations/_file_services_operations.py
index 4e5ea192885a..3ea7dba8cff8 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/operations/_file_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/operations/_file_services_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,
@@ -19,20 +18,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -185,7 +182,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
         :rtype: ~azure.mgmt.storage.v2019_04_01.models.FileServiceItems
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -207,7 +204,6 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -221,7 +217,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileServiceItems", pipeline_response)
+        deserialized = self._deserialize("FileServiceItems", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -328,7 +324,7 @@ def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2019_04_01.models.FileServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -363,7 +359,6 @@ def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -377,7 +372,7 @@ def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileServiceProperties", pipeline_response)
+        deserialized = self._deserialize("FileServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -405,7 +400,7 @@ def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2019_04_01.models.FileServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -428,7 +423,6 @@ def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -442,7 +436,7 @@ def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileServiceProperties", pipeline_response)
+        deserialized = self._deserialize("FileServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/operations/_file_shares_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/operations/_file_shares_operations.py
index cbd78c8dd045..223ca0aa4de8 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/operations/_file_shares_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/operations/_file_shares_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 (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -287,7 +284,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-04-01"))
         cls: ClsType[_models.FileShareItems] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -309,7 +306,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -325,7 +321,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -460,7 +455,7 @@ def create(
         :rtype: ~azure.mgmt.storage.v2019_04_01.models.FileShare
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -495,7 +490,6 @@ def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -509,11 +503,7 @@ def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("FileShare", pipeline_response)
-
-        if response.status_code == 201:
-            deserialized = self._deserialize("FileShare", pipeline_response)
+        deserialized = self._deserialize("FileShare", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -623,7 +613,7 @@ def update(
         :rtype: ~azure.mgmt.storage.v2019_04_01.models.FileShare
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -658,7 +648,6 @@ def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -672,7 +661,7 @@ def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileShare", pipeline_response)
+        deserialized = self._deserialize("FileShare", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -699,7 +688,7 @@ def get(self, resource_group_name: str, account_name: str, share_name: str, **kw
         :rtype: ~azure.mgmt.storage.v2019_04_01.models.FileShare
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -722,7 +711,6 @@ def get(self, resource_group_name: str, account_name: str, share_name: str, **kw
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -736,7 +724,7 @@ def get(self, resource_group_name: str, account_name: str, share_name: str, **kw
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileShare", pipeline_response)
+        deserialized = self._deserialize("FileShare", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -765,7 +753,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,
@@ -788,7 +776,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/operations/_management_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/operations/_management_policies_operations.py
index cb4dc603c8ba..042a9359a927 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/operations/_management_policies_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/operations/_management_policies_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,
@@ -19,20 +18,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -196,7 +193,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2019_04_01.models.ManagementPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -219,7 +216,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -233,7 +229,7 @@ def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ManagementPolicy", pipeline_response)
+        deserialized = self._deserialize("ManagementPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -337,7 +333,7 @@ def create_or_update(
         :rtype: ~azure.mgmt.storage.v2019_04_01.models.ManagementPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -372,7 +368,6 @@ def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -386,7 +381,7 @@ def create_or_update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ManagementPolicy", pipeline_response)
+        deserialized = self._deserialize("ManagementPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -418,7 +413,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,
@@ -441,7 +436,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/operations/_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/operations/_operations.py
index b6f8758d542b..c0a9cc40dfb4 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/operations/_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/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 (
@@ -20,20 +19,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -94,7 +91,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.Operation"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-04-01"))
         cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -110,7 +107,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -126,7 +122,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/operations/_skus_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/operations/_skus_operations.py
index af99e9bb342d..aaf52b6b54bb 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/operations/_skus_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/operations/_skus_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 (
@@ -20,20 +19,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -99,7 +96,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.Sku"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-04-01"))
         cls: ClsType[_models.StorageSkuListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -116,7 +113,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -132,7 +128,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/operations/_storage_accounts_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/operations/_storage_accounts_operations.py
index acfb574ee6d9..6003aafddfdb 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/operations/_storage_accounts_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/operations/_storage_accounts_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,7 @@
 # --------------------------------------------------------------------------
 from io import IOBase
 import sys
-from typing import Any, Callable, Dict, IO, Iterable, Literal, Optional, Type, TypeVar, Union, cast, overload
+from typing import Any, Callable, Dict, IO, Iterable, Iterator, Literal, Optional, TypeVar, Union, cast, overload
 import urllib.parse
 
 from azure.core.exceptions import (
@@ -17,13 +17,14 @@
     ResourceExistsError,
     ResourceNotFoundError,
     ResourceNotModifiedError,
+    StreamClosedError,
+    StreamConsumedError,
     map_error,
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
 from azure.core.polling import LROPoller, NoPolling, PollingMethod
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
@@ -31,12 +32,11 @@
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -546,7 +546,7 @@ def check_name_availability(
         :rtype: ~azure.mgmt.storage.v2019_04_01.models.CheckNameAvailabilityResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -578,7 +578,6 @@ def check_name_availability(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -592,7 +591,7 @@ def check_name_availability(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response)
+        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -605,8 +604,8 @@ def _create_initial(
         account_name: str,
         parameters: Union[_models.StorageAccountCreateParameters, IO[bytes]],
         **kwargs: Any
-    ) -> Optional[_models.StorageAccount]:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> Iterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -619,7 +618,7 @@ def _create_initial(
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-04-01"))
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
-        cls: ClsType[Optional[_models.StorageAccount]] = kwargs.pop("cls", None)
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
         _json = None
@@ -640,10 +639,10 @@ def _create_initial(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -651,12 +650,14 @@ def _create_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = None
-        if response.status_code == 200:
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -779,10 +780,11 @@ def begin_create(
                 params=_params,
                 **kwargs
             )
+            raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+            deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
             if cls:
                 return cls(pipeline_response, deserialized, {})  # type: ignore
             return deserialized
@@ -821,7 +823,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,
@@ -843,7 +845,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -887,7 +888,7 @@ def get_properties(
         :rtype: ~azure.mgmt.storage.v2019_04_01.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -910,7 +911,6 @@ def get_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -924,7 +924,7 @@ def get_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1035,7 +1035,7 @@ def update(
         :rtype: ~azure.mgmt.storage.v2019_04_01.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1069,7 +1069,6 @@ def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1083,7 +1082,7 @@ def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1105,7 +1104,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.StorageAccount"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-04-01"))
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1122,7 +1121,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -1138,7 +1136,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -1185,7 +1182,7 @@ def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> Ite
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-04-01"))
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1203,7 +1200,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -1219,7 +1215,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -1269,7 +1264,7 @@ def list_keys(
         :rtype: ~azure.mgmt.storage.v2019_04_01.models.StorageAccountListKeysResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1292,7 +1287,6 @@ def list_keys(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1306,7 +1300,7 @@ def list_keys(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response)
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1400,7 +1394,7 @@ def regenerate_key(
         :rtype: ~azure.mgmt.storage.v2019_04_01.models.StorageAccountListKeysResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1434,7 +1428,6 @@ def regenerate_key(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1448,7 +1441,7 @@ def regenerate_key(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response)
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1539,7 +1532,7 @@ def list_account_sas(
         :rtype: ~azure.mgmt.storage.v2019_04_01.models.ListAccountSasResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1573,7 +1566,6 @@ def list_account_sas(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1587,7 +1579,7 @@ def list_account_sas(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListAccountSasResponse", pipeline_response)
+        deserialized = self._deserialize("ListAccountSasResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1676,7 +1668,7 @@ def list_service_sas(
         :rtype: ~azure.mgmt.storage.v2019_04_01.models.ListServiceSasResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1710,7 +1702,6 @@ def list_service_sas(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1724,17 +1715,15 @@ def list_service_sas(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListServiceSasResponse", pipeline_response)
+        deserialized = self._deserialize("ListServiceSasResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
 
         return deserialized  # type: ignore
 
-    def _failover_initial(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, **kwargs: Any
-    ) -> None:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    def _failover_initial(self, resource_group_name: str, account_name: str, **kwargs: Any) -> Iterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1746,7 +1735,7 @@ def _failover_initial(  # pylint: disable=inconsistent-return-statements
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-04-01"))
-        cls: ClsType[None] = kwargs.pop("cls", None)
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
 
         _request = build_failover_request(
             resource_group_name=resource_group_name,
@@ -1756,10 +1745,10 @@ def _failover_initial(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -1767,11 +1756,19 @@ def _failover_initial(  # pylint: disable=inconsistent-return-statements
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
-            return cls(pipeline_response, None, {})  # type: ignore
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
 
     @distributed_trace
     def begin_failover(self, resource_group_name: str, account_name: str, **kwargs: Any) -> LROPoller[None]:
@@ -1799,7 +1796,7 @@ def begin_failover(self, resource_group_name: str, account_name: str, **kwargs:
         lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
         cont_token: Optional[str] = kwargs.pop("continuation_token", None)
         if cont_token is None:
-            raw_result = self._failover_initial(  # type: ignore
+            raw_result = self._failover_initial(
                 resource_group_name=resource_group_name,
                 account_name=account_name,
                 api_version=api_version,
@@ -1808,6 +1805,7 @@ def begin_failover(self, resource_group_name: str, account_name: str, **kwargs:
                 params=_params,
                 **kwargs
             )
+            raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
@@ -1848,7 +1846,7 @@ def revoke_user_delegation_keys(  # pylint: disable=inconsistent-return-statemen
         :rtype: None
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1870,7 +1868,6 @@ def revoke_user_delegation_keys(  # pylint: disable=inconsistent-return-statemen
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/operations/_usages_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/operations/_usages_operations.py
index 463a1c56fb07..0da0fa861600 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/operations/_usages_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_04_01/operations/_usages_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 (
@@ -20,20 +19,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -105,7 +102,7 @@ def list_by_location(self, location: str, **kwargs: Any) -> Iterable["_models.Us
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-04-01"))
         cls: ClsType[_models.UsageListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -123,7 +120,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -139,7 +135,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/__init__.py
index a860a5c185c9..60980065e1ee 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/__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 ._storage_management_client import StorageManagementClient
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._storage_management_client import StorageManagementClient  # 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__ = [
     "StorageManagementClient",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/_configuration.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/_configuration.py
index 930089579920..b0411488a599 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/_configuration.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/_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 StorageManagementClientConfiguration:  # pylint: disable=too-many-instance-attributes,name-too-long
+class StorageManagementClientConfiguration:  # pylint: disable=too-many-instance-attributes
     """Configuration for StorageManagementClient.
 
     Note that all parameters used to create this instance are saved as instance
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/_metadata.json b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/_metadata.json
index d0aad11e8f3c..222e258ecdbb 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/_metadata.json
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/_metadata.json
@@ -10,8 +10,8 @@
         "azure_arm": true,
         "has_public_lro_operations": true,
         "client_side_validation": false,
-        "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"ARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementClientConfiguration\"], \".._serialization\": [\"Deserializer\", \"Serializer\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}}",
-        "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"AsyncARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"AsyncARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementClientConfiguration\"], \"..._serialization\": [\"Deserializer\", \"Serializer\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"]}}}"
+        "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"ARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementClientConfiguration\"], \".._serialization\": [\"Deserializer\", \"Serializer\"]}, \"stdlib\": {\"typing_extensions\": [\"Self\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}}",
+        "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"AsyncARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"AsyncARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementClientConfiguration\"], \"..._serialization\": [\"Deserializer\", \"Serializer\"]}, \"stdlib\": {\"typing_extensions\": [\"Self\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"]}}}"
     },
     "global_parameters": {
         "sync": {
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/_storage_management_client.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/_storage_management_client.py
index 6e61963301dc..a4e5fc844856 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/_storage_management_client.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/_storage_management_client.py
@@ -8,6 +8,7 @@
 
 from copy import deepcopy
 from typing import Any, TYPE_CHECKING
+from typing_extensions import Self
 
 from azure.core.pipeline import policies
 from azure.core.rest import HttpRequest, HttpResponse
@@ -39,11 +40,10 @@
 )
 
 if TYPE_CHECKING:
-    # pylint: disable=unused-import,ungrouped-imports
     from azure.core.credentials import TokenCredential
 
 
-class StorageManagementClient:  # pylint: disable=client-accepts-api-version-keyword,too-many-instance-attributes
+class StorageManagementClient:  # pylint: disable=too-many-instance-attributes
     """The Azure Storage Management API.
 
     :ivar operations: Operations operations
@@ -205,7 +205,7 @@ def _send_request(self, request: HttpRequest, *, stream: bool = False, **kwargs:
     def close(self) -> None:
         self._client.close()
 
-    def __enter__(self) -> "StorageManagementClient":
+    def __enter__(self) -> Self:
         self._client.__enter__()
         return self
 
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/_vendor.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/_vendor.py
deleted file mode 100644
index 0dafe0e287ff..000000000000
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/_vendor.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# --------------------------------------------------------------------------
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License. See License.txt in the project root for license information.
-# Code generated by Microsoft (R) AutoRest Code Generator.
-# Changes may cause incorrect behavior and will be lost if the code is regenerated.
-# --------------------------------------------------------------------------
-
-from azure.core.pipeline.transport import HttpRequest
-
-
-def _convert_request(request, files=None):
-    data = request.content if not files else None
-    request = HttpRequest(method=request.method, url=request.url, headers=request.headers, data=data)
-    if files:
-        request.set_formdata_body(files)
-    return request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/_version.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/_version.py
index 5a163c0afedc..e5754a47ce68 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/_version.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/_version.py
@@ -6,4 +6,4 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-VERSION = "21.2.1"
\ No newline at end of file
+VERSION = "1.0.0b1"
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/__init__.py
index a5c3d2414cfd..ee2b940bd4fc 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/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 ._storage_management_client import StorageManagementClient
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._storage_management_client import StorageManagementClient  # 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__ = [
     "StorageManagementClient",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/_configuration.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/_configuration.py
index 1df02180dece..4563ef1ea72b 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/_configuration.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/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 StorageManagementClientConfiguration:  # pylint: disable=too-many-instance-attributes,name-too-long
+class StorageManagementClientConfiguration:  # pylint: disable=too-many-instance-attributes
     """Configuration for StorageManagementClient.
 
     Note that all parameters used to create this instance are saved as instance
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/_storage_management_client.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/_storage_management_client.py
index c9cb501a41f7..9cdb870e8540 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/_storage_management_client.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/_storage_management_client.py
@@ -8,6 +8,7 @@
 
 from copy import deepcopy
 from typing import Any, Awaitable, TYPE_CHECKING
+from typing_extensions import Self
 
 from azure.core.pipeline import policies
 from azure.core.rest import AsyncHttpResponse, HttpRequest
@@ -39,11 +40,10 @@
 )
 
 if TYPE_CHECKING:
-    # pylint: disable=unused-import,ungrouped-imports
     from azure.core.credentials_async import AsyncTokenCredential
 
 
-class StorageManagementClient:  # pylint: disable=client-accepts-api-version-keyword,too-many-instance-attributes
+class StorageManagementClient:  # pylint: disable=too-many-instance-attributes
     """The Azure Storage Management API.
 
     :ivar operations: Operations operations
@@ -209,7 +209,7 @@ def _send_request(
     async def close(self) -> None:
         await self._client.close()
 
-    async def __aenter__(self) -> "StorageManagementClient":
+    async def __aenter__(self) -> Self:
         await self._client.__aenter__()
         return self
 
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/operations/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/operations/__init__.py
index d796f35045aa..b529831709ad 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/operations/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/operations/__init__.py
@@ -5,28 +5,34 @@
 # 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 ._skus_operations import SkusOperations
-from ._storage_accounts_operations import StorageAccountsOperations
-from ._usages_operations import UsagesOperations
-from ._management_policies_operations import ManagementPoliciesOperations
-from ._blob_inventory_policies_operations import BlobInventoryPoliciesOperations
-from ._private_endpoint_connections_operations import PrivateEndpointConnectionsOperations
-from ._private_link_resources_operations import PrivateLinkResourcesOperations
-from ._object_replication_policies_operations import ObjectReplicationPoliciesOperations
-from ._encryption_scopes_operations import EncryptionScopesOperations
-from ._blob_services_operations import BlobServicesOperations
-from ._blob_containers_operations import BlobContainersOperations
-from ._file_services_operations import FileServicesOperations
-from ._file_shares_operations import FileSharesOperations
-from ._queue_services_operations import QueueServicesOperations
-from ._queue_operations import QueueOperations
-from ._table_services_operations import TableServicesOperations
-from ._table_operations import TableOperations
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._operations import Operations  # type: ignore
+from ._skus_operations import SkusOperations  # type: ignore
+from ._storage_accounts_operations import StorageAccountsOperations  # type: ignore
+from ._usages_operations import UsagesOperations  # type: ignore
+from ._management_policies_operations import ManagementPoliciesOperations  # type: ignore
+from ._blob_inventory_policies_operations import BlobInventoryPoliciesOperations  # type: ignore
+from ._private_endpoint_connections_operations import PrivateEndpointConnectionsOperations  # type: ignore
+from ._private_link_resources_operations import PrivateLinkResourcesOperations  # type: ignore
+from ._object_replication_policies_operations import ObjectReplicationPoliciesOperations  # type: ignore
+from ._encryption_scopes_operations import EncryptionScopesOperations  # type: ignore
+from ._blob_services_operations import BlobServicesOperations  # type: ignore
+from ._blob_containers_operations import BlobContainersOperations  # type: ignore
+from ._file_services_operations import FileServicesOperations  # type: ignore
+from ._file_shares_operations import FileSharesOperations  # type: ignore
+from ._queue_services_operations import QueueServicesOperations  # type: ignore
+from ._queue_operations import QueueOperations  # type: ignore
+from ._table_services_operations import TableServicesOperations  # type: ignore
+from ._table_operations import TableOperations  # 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__ = [
@@ -49,5 +55,5 @@
     "TableServicesOperations",
     "TableOperations",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/operations/_blob_containers_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/operations/_blob_containers_operations.py
index fdeb87a361d3..c34a58396c05 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/operations/_blob_containers_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/operations/_blob_containers_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,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
@@ -21,15 +21,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._blob_containers_operations import (
     build_clear_legal_hold_request,
     build_create_or_update_immutability_policy_request,
@@ -49,7 +47,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]]
 
@@ -114,7 +112,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-06-01"))
         cls: ClsType[_models.ListContainerItems] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -136,7 +134,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -152,7 +149,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -287,7 +283,7 @@ async def create(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -322,7 +318,6 @@ async def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -336,11 +331,7 @@ async def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("BlobContainer", pipeline_response)
-
-        if response.status_code == 201:
-            deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -450,7 +441,7 @@ async def update(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -485,7 +476,6 @@ async def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -499,7 +489,7 @@ async def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -528,7 +518,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -551,7 +541,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -565,7 +554,7 @@ async def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -573,9 +562,7 @@ async def get(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, container_name: str, **kwargs: Any
-    ) -> None:
+    async def delete(self, resource_group_name: str, account_name: str, container_name: str, **kwargs: Any) -> None:
         """Deletes specified container under its account.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -594,7 +581,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,
@@ -617,7 +604,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -740,7 +726,7 @@ async def set_legal_hold(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.LegalHold
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -775,7 +761,6 @@ async def set_legal_hold(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -789,7 +774,7 @@ async def set_legal_hold(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LegalHold", pipeline_response)
+        deserialized = self._deserialize("LegalHold", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -899,7 +884,7 @@ async def clear_legal_hold(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.LegalHold
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -934,7 +919,6 @@ async def clear_legal_hold(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -948,7 +932,7 @@ async def clear_legal_hold(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LegalHold", pipeline_response)
+        deserialized = self._deserialize("LegalHold", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1087,7 +1071,7 @@ async def create_or_update_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1127,7 +1111,6 @@ async def create_or_update_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1144,7 +1127,7 @@ async def create_or_update_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1187,7 +1170,7 @@ async def get_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1212,7 +1195,6 @@ async def get_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1229,7 +1211,7 @@ async def get_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1274,7 +1256,7 @@ async def delete_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1299,7 +1281,6 @@ async def delete_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1316,7 +1297,7 @@ async def delete_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1350,7 +1331,7 @@ async def lock_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1374,7 +1355,6 @@ async def lock_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1391,7 +1371,7 @@ async def lock_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1521,7 +1501,7 @@ async def extend_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1560,7 +1540,6 @@ async def extend_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1577,7 +1556,7 @@ async def extend_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1687,7 +1666,7 @@ async def lease(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.LeaseContainerResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1725,7 +1704,6 @@ async def lease(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1739,7 +1717,7 @@ async def lease(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LeaseContainerResponse", pipeline_response)
+        deserialized = self._deserialize("LeaseContainerResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/operations/_blob_inventory_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/operations/_blob_inventory_policies_operations.py
index a907a7ef28cd..a0aa906918fa 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/operations/_blob_inventory_policies_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/operations/_blob_inventory_policies_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._blob_inventory_policies_operations import (
     build_create_or_update_request,
     build_delete_request,
@@ -40,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]]
 
@@ -90,7 +87,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.BlobInventoryPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -113,7 +110,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -128,7 +124,7 @@ async def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response)
+        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -232,7 +228,7 @@ async def create_or_update(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.BlobInventoryPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -267,7 +263,6 @@ async def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -282,7 +277,7 @@ async def create_or_update(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response)
+        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -290,7 +285,7 @@ async def create_or_update(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
+    async def delete(
         self,
         resource_group_name: str,
         account_name: str,
@@ -314,7 +309,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,
@@ -337,7 +332,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -379,7 +373,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-06-01"))
         cls: ClsType[_models.ListBlobInventoryPolicy] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -398,7 +392,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -414,7 +407,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/operations/_blob_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/operations/_blob_services_operations.py
index f99fe53d90cd..6e454850c2de 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/operations/_blob_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/operations/_blob_services_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._blob_services_operations import (
     build_get_service_properties_request,
     build_list_request,
@@ -39,7 +36,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 +86,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-06-01"))
         cls: ClsType[_models.BlobServiceItems] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -108,7 +105,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -124,7 +120,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -253,7 +248,7 @@ async def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.BlobServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -288,7 +283,6 @@ async def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -302,7 +296,7 @@ async def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobServiceProperties", pipeline_response)
+        deserialized = self._deserialize("BlobServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -330,7 +324,7 @@ async def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.BlobServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -353,7 +347,6 @@ async def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -367,7 +360,7 @@ async def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobServiceProperties", pipeline_response)
+        deserialized = self._deserialize("BlobServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/operations/_encryption_scopes_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/operations/_encryption_scopes_operations.py
index 9125fbbed8ba..15d6b9c6383f 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/operations/_encryption_scopes_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/operations/_encryption_scopes_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._encryption_scopes_operations import (
     build_get_request,
     build_list_request,
@@ -40,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]]
 
@@ -173,7 +170,7 @@ async def put(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.EncryptionScope
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -208,7 +205,6 @@ async def put(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -223,11 +219,7 @@ async def put(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("EncryptionScope", pipeline_response)
-
-        if response.status_code == 201:
-            deserialized = self._deserialize("EncryptionScope", pipeline_response)
+        deserialized = self._deserialize("EncryptionScope", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -337,7 +329,7 @@ async def patch(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.EncryptionScope
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -372,7 +364,6 @@ async def patch(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -387,7 +378,7 @@ async def patch(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("EncryptionScope", pipeline_response)
+        deserialized = self._deserialize("EncryptionScope", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -416,7 +407,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.EncryptionScope
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -439,7 +430,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -454,7 +444,7 @@ async def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("EncryptionScope", pipeline_response)
+        deserialized = self._deserialize("EncryptionScope", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -485,7 +475,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-06-01"))
         cls: ClsType[_models.EncryptionScopeListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -504,7 +494,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -520,7 +509,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/operations/_file_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/operations/_file_services_operations.py
index b1eea16c4f84..835999570b5f 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/operations/_file_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/operations/_file_services_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,
@@ -19,14 +18,12 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._file_services_operations import (
     build_get_service_properties_request,
     build_list_request,
@@ -36,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]]
 
@@ -76,7 +73,7 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.FileServiceItems
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -98,7 +95,6 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -112,7 +108,7 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileServiceItems", pipeline_response)
+        deserialized = self._deserialize("FileServiceItems", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -219,7 +215,7 @@ async def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.FileServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -254,7 +250,6 @@ async def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -268,7 +263,7 @@ async def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileServiceProperties", pipeline_response)
+        deserialized = self._deserialize("FileServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -296,7 +291,7 @@ async def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.FileServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -319,7 +314,6 @@ async def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -333,7 +327,7 @@ async def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileServiceProperties", pipeline_response)
+        deserialized = self._deserialize("FileServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/operations/_file_shares_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/operations/_file_shares_operations.py
index 4c7b6c438832..6748c636e451 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/operations/_file_shares_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/operations/_file_shares_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, Literal, Optional, Type, TypeVar, Union, overload
+from typing import Any, AsyncIterable, Callable, Dict, IO, Literal, Optional, TypeVar, Union, overload
 import urllib.parse
 
 from azure.core.async_paging import AsyncItemPaged, AsyncList
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._file_shares_operations import (
     build_create_request,
     build_delete_request,
@@ -42,7 +39,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]]
 
@@ -106,7 +103,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-06-01"))
         cls: ClsType[_models.FileShareItems] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -128,7 +125,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -144,7 +140,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -279,7 +274,7 @@ async def create(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.FileShare
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -314,7 +309,6 @@ async def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -328,11 +322,7 @@ async def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("FileShare", pipeline_response)
-
-        if response.status_code == 201:
-            deserialized = self._deserialize("FileShare", pipeline_response)
+        deserialized = self._deserialize("FileShare", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -442,7 +432,7 @@ async def update(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.FileShare
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -477,7 +467,6 @@ async def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -491,7 +480,7 @@ async def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileShare", pipeline_response)
+        deserialized = self._deserialize("FileShare", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -528,7 +517,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.FileShare
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -552,7 +541,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -566,7 +554,7 @@ async def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileShare", pipeline_response)
+        deserialized = self._deserialize("FileShare", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -574,9 +562,7 @@ async def get(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, share_name: str, **kwargs: Any
-    ) -> None:
+    async def delete(self, resource_group_name: str, account_name: str, share_name: str, **kwargs: Any) -> None:
         """Deletes specified share under its account.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -595,7 +581,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,
@@ -618,7 +604,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -636,7 +621,7 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             return cls(pipeline_response, None, {})  # type: ignore
 
     @overload
-    async def restore(  # pylint: disable=inconsistent-return-statements
+    async def restore(
         self,
         resource_group_name: str,
         account_name: str,
@@ -671,7 +656,7 @@ async def restore(  # pylint: disable=inconsistent-return-statements
         """
 
     @overload
-    async def restore(  # pylint: disable=inconsistent-return-statements
+    async def restore(
         self,
         resource_group_name: str,
         account_name: str,
@@ -706,7 +691,7 @@ async def restore(  # pylint: disable=inconsistent-return-statements
         """
 
     @distributed_trace_async
-    async def restore(  # pylint: disable=inconsistent-return-statements
+    async def restore(
         self,
         resource_group_name: str,
         account_name: str,
@@ -734,7 +719,7 @@ async def restore(  # 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,
@@ -769,7 +754,6 @@ async def restore(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/operations/_management_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/operations/_management_policies_operations.py
index 7c0e0e7c3858..28fd08cef210 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/operations/_management_policies_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/operations/_management_policies_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,
@@ -19,14 +18,12 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._management_policies_operations import (
     build_create_or_update_request,
     build_delete_request,
@@ -36,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]]
 
@@ -86,7 +83,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.ManagementPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -109,7 +106,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -123,7 +119,7 @@ async def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ManagementPolicy", pipeline_response)
+        deserialized = self._deserialize("ManagementPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -227,7 +223,7 @@ async def create_or_update(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.ManagementPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -262,7 +258,6 @@ async def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -276,7 +271,7 @@ async def create_or_update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ManagementPolicy", pipeline_response)
+        deserialized = self._deserialize("ManagementPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -284,7 +279,7 @@ async def create_or_update(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
+    async def delete(
         self,
         resource_group_name: str,
         account_name: str,
@@ -308,7 +303,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,
@@ -331,7 +326,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/operations/_object_replication_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/operations/_object_replication_policies_operations.py
index fcd43b94baa9..b96bc1132574 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/operations/_object_replication_policies_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/operations/_object_replication_policies_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._object_replication_policies_operations import (
     build_create_or_update_request,
     build_delete_request,
@@ -40,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]]
 
@@ -90,7 +87,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-06-01"))
         cls: ClsType[_models.ObjectReplicationPolicies] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -109,7 +106,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -125,7 +121,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -175,7 +170,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.ObjectReplicationPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -198,7 +193,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -213,7 +207,7 @@ async def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response)
+        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -317,7 +311,7 @@ async def create_or_update(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.ObjectReplicationPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -352,7 +346,6 @@ async def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -367,7 +360,7 @@ async def create_or_update(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response)
+        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -375,7 +368,7 @@ async def create_or_update(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
+    async def delete(
         self, resource_group_name: str, account_name: str, object_replication_policy_id: str, **kwargs: Any
     ) -> None:
         """Deletes the object replication policy associated with the specified storage account.
@@ -394,7 +387,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,
@@ -417,7 +410,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/operations/_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/operations/_operations.py
index 273b31c2bb01..8eb80d771781 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/operations/_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/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
@@ -20,20 +19,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._operations import build_list_request
 
 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]]
 
@@ -73,7 +70,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.Operation"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-06-01"))
         cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -89,7 +86,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -105,7 +101,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/operations/_private_endpoint_connections_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/operations/_private_endpoint_connections_operations.py
index 67d772564818..256f5334cadf 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/operations/_private_endpoint_connections_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/operations/_private_endpoint_connections_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._private_endpoint_connections_operations import (
     build_delete_request,
     build_get_request,
@@ -40,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]]
 
@@ -90,7 +87,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-06-01"))
         cls: ClsType[_models.PrivateEndpointConnectionListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -109,7 +106,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -125,7 +121,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -174,7 +169,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.PrivateEndpointConnection
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -197,7 +192,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -212,7 +206,7 @@ async def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response)
+        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -313,7 +307,7 @@ async def put(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.PrivateEndpointConnection
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -348,7 +342,6 @@ async def put(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -363,7 +356,7 @@ async def put(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response)
+        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -371,7 +364,7 @@ async def put(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
+    async def delete(
         self, resource_group_name: str, account_name: str, private_endpoint_connection_name: str, **kwargs: Any
     ) -> None:
         """Deletes the specified private endpoint connection associated with the storage account.
@@ -390,7 +383,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,
@@ -413,7 +406,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/operations/_private_link_resources_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/operations/_private_link_resources_operations.py
index ea7dae57af8b..594d676eba82 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/operations/_private_link_resources_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/operations/_private_link_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, Optional, Type, TypeVar
+from typing import Any, Callable, Dict, Optional, TypeVar
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -18,20 +17,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._private_link_resources_operations import build_list_by_storage_account_request
 
 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]]
 
@@ -73,7 +70,7 @@ async def list_by_storage_account(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.PrivateLinkResourceListResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -95,7 +92,6 @@ async def list_by_storage_account(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -109,7 +105,7 @@ async def list_by_storage_account(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("PrivateLinkResourceListResult", pipeline_response)
+        deserialized = self._deserialize("PrivateLinkResourceListResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/operations/_queue_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/operations/_queue_operations.py
index 7c6f1dbcb3f0..4d36651587df 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/operations/_queue_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/operations/_queue_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._queue_operations import (
     build_create_request,
     build_delete_request,
@@ -41,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]]
 
@@ -166,7 +163,7 @@ async def create(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.StorageQueue
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -201,7 +198,6 @@ async def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -215,7 +211,7 @@ async def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageQueue", pipeline_response)
+        deserialized = self._deserialize("StorageQueue", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -322,7 +318,7 @@ async def update(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.StorageQueue
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -357,7 +353,6 @@ async def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -371,7 +366,7 @@ async def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageQueue", pipeline_response)
+        deserialized = self._deserialize("StorageQueue", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -400,7 +395,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.StorageQueue
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -423,7 +418,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -437,7 +431,7 @@ async def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageQueue", pipeline_response)
+        deserialized = self._deserialize("StorageQueue", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -445,9 +439,7 @@ async def get(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, queue_name: str, **kwargs: Any
-    ) -> None:
+    async def delete(self, resource_group_name: str, account_name: str, queue_name: str, **kwargs: Any) -> None:
         """Deletes the queue with the specified queue name, under the specified account if it exists.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -466,7 +458,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,
@@ -489,7 +481,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -541,7 +532,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-06-01"))
         cls: ClsType[_models.ListQueueResource] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -562,7 +553,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -578,7 +568,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/operations/_queue_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/operations/_queue_services_operations.py
index 09ff686365bd..d5af3a0e1640 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/operations/_queue_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/operations/_queue_services_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,
@@ -19,14 +18,12 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._queue_services_operations import (
     build_get_service_properties_request,
     build_list_request,
@@ -36,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]]
 
@@ -76,7 +73,7 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.ListQueueServices
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -98,7 +95,6 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -112,7 +108,7 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListQueueServices", pipeline_response)
+        deserialized = self._deserialize("ListQueueServices", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -219,7 +215,7 @@ async def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.QueueServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -254,7 +250,6 @@ async def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -268,7 +263,7 @@ async def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("QueueServiceProperties", pipeline_response)
+        deserialized = self._deserialize("QueueServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -296,7 +291,7 @@ async def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.QueueServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -319,7 +314,6 @@ async def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -333,7 +327,7 @@ async def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("QueueServiceProperties", pipeline_response)
+        deserialized = self._deserialize("QueueServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/operations/_skus_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/operations/_skus_operations.py
index 4da075450ce4..fc51a0e33dee 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/operations/_skus_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/operations/_skus_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
@@ -20,20 +19,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._skus_operations import build_list_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
 
@@ -73,7 +70,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.SkuInformation"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-06-01"))
         cls: ClsType[_models.StorageSkuListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -90,7 +87,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -106,7 +102,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/operations/_storage_accounts_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/operations/_storage_accounts_operations.py
index b0834c0b1e89..1356e122e419 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/operations/_storage_accounts_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/operations/_storage_accounts_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,20 @@
 # --------------------------------------------------------------------------
 from io import IOBase
 import sys
-from typing import Any, AsyncIterable, Callable, Dict, IO, Literal, Optional, Type, TypeVar, Union, cast, overload
+from typing import (
+    Any,
+    AsyncIterable,
+    AsyncIterator,
+    Callable,
+    Dict,
+    IO,
+    Literal,
+    Optional,
+    TypeVar,
+    Union,
+    cast,
+    overload,
+)
 import urllib.parse
 
 from azure.core.async_paging import AsyncItemPaged, AsyncList
@@ -18,12 +31,13 @@
     ResourceExistsError,
     ResourceNotFoundError,
     ResourceNotModifiedError,
+    StreamClosedError,
+    StreamConsumedError,
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
 from azure.core.polling import AsyncLROPoller, AsyncNoPolling, AsyncPollingMethod
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
@@ -31,7 +45,6 @@
 from azure.mgmt.core.polling.async_arm_polling import AsyncARMPolling
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._storage_accounts_operations import (
     build_check_name_availability_request,
     build_create_request,
@@ -52,7 +65,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]]
 
@@ -135,7 +148,7 @@ async def check_name_availability(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.CheckNameAvailabilityResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -167,7 +180,6 @@ async def check_name_availability(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -181,7 +193,7 @@ async def check_name_availability(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response)
+        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -194,8 +206,8 @@ async def _create_initial(
         account_name: str,
         parameters: Union[_models.StorageAccountCreateParameters, IO[bytes]],
         **kwargs: Any
-    ) -> Optional[_models.StorageAccount]:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -208,7 +220,7 @@ async def _create_initial(
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-06-01"))
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
-        cls: ClsType[Optional[_models.StorageAccount]] = kwargs.pop("cls", None)
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
         _json = None
@@ -229,10 +241,10 @@ async def _create_initial(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -240,12 +252,14 @@ async def _create_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = None
-        if response.status_code == 200:
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -371,10 +385,11 @@ async def begin_create(
                 params=_params,
                 **kwargs
             )
+            await raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+            deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
             if cls:
                 return cls(pipeline_response, deserialized, {})  # type: ignore
             return deserialized
@@ -397,9 +412,7 @@ def get_long_running_output(pipeline_response):
         )
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, **kwargs: Any
-    ) -> None:
+    async def delete(self, resource_group_name: str, account_name: str, **kwargs: Any) -> None:
         """Deletes a storage account in Microsoft Azure.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -413,7 +426,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,
@@ -435,7 +448,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -480,7 +492,7 @@ async def get_properties(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -503,7 +515,6 @@ async def get_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -517,7 +528,7 @@ async def get_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -628,7 +639,7 @@ async def update(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -662,7 +673,6 @@ async def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -676,7 +686,7 @@ async def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -699,7 +709,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.StorageAccount"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-06-01"))
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -716,7 +726,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -732,7 +741,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -782,7 +790,7 @@ def list_by_resource_group(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-06-01"))
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -800,7 +808,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -816,7 +823,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -866,7 +872,7 @@ async def list_keys(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.StorageAccountListKeysResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -889,7 +895,6 @@ async def list_keys(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -903,7 +908,7 @@ async def list_keys(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response)
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -997,7 +1002,7 @@ async def regenerate_key(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.StorageAccountListKeysResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1031,7 +1036,6 @@ async def regenerate_key(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1045,7 +1049,7 @@ async def regenerate_key(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response)
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1136,7 +1140,7 @@ async def list_account_sas(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.ListAccountSasResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1170,7 +1174,6 @@ async def list_account_sas(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1184,7 +1187,7 @@ async def list_account_sas(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListAccountSasResponse", pipeline_response)
+        deserialized = self._deserialize("ListAccountSasResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1273,7 +1276,7 @@ async def list_service_sas(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.ListServiceSasResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1307,7 +1310,6 @@ async def list_service_sas(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1321,17 +1323,17 @@ async def list_service_sas(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListServiceSasResponse", pipeline_response)
+        deserialized = self._deserialize("ListServiceSasResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
 
         return deserialized  # type: ignore
 
-    async def _failover_initial(  # pylint: disable=inconsistent-return-statements
+    async def _failover_initial(
         self, resource_group_name: str, account_name: str, **kwargs: Any
-    ) -> None:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1343,7 +1345,7 @@ async def _failover_initial(  # pylint: disable=inconsistent-return-statements
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-06-01"))
-        cls: ClsType[None] = kwargs.pop("cls", None)
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
 
         _request = build_failover_request(
             resource_group_name=resource_group_name,
@@ -1353,10 +1355,10 @@ async def _failover_initial(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -1364,11 +1366,19 @@ async def _failover_initial(  # pylint: disable=inconsistent-return-statements
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
-            return cls(pipeline_response, None, {})  # type: ignore
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
 
     @distributed_trace_async
     async def begin_failover(self, resource_group_name: str, account_name: str, **kwargs: Any) -> AsyncLROPoller[None]:
@@ -1396,7 +1406,7 @@ async def begin_failover(self, resource_group_name: str, account_name: str, **kw
         lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
         cont_token: Optional[str] = kwargs.pop("continuation_token", None)
         if cont_token is None:
-            raw_result = await self._failover_initial(  # type: ignore
+            raw_result = await self._failover_initial(
                 resource_group_name=resource_group_name,
                 account_name=account_name,
                 api_version=api_version,
@@ -1405,6 +1415,7 @@ async def begin_failover(self, resource_group_name: str, account_name: str, **kw
                 params=_params,
                 **kwargs
             )
+            await raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
@@ -1434,8 +1445,8 @@ async def _restore_blob_ranges_initial(
         account_name: str,
         parameters: Union[_models.BlobRestoreParameters, IO[bytes]],
         **kwargs: Any
-    ) -> _models.BlobRestoreStatus:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1448,7 +1459,7 @@ async def _restore_blob_ranges_initial(
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-06-01"))
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
-        cls: ClsType[_models.BlobRestoreStatus] = kwargs.pop("cls", None)
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
         _json = None
@@ -1469,10 +1480,10 @@ async def _restore_blob_ranges_initial(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -1480,14 +1491,14 @@ async def _restore_blob_ranges_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response)
-
-        if response.status_code == 202:
-            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response)
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1603,10 +1614,11 @@ async def begin_restore_blob_ranges(
                 params=_params,
                 **kwargs
             )
+            await raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):
-            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response)
+            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response.http_response)
             if cls:
                 return cls(pipeline_response, deserialized, {})  # type: ignore
             return deserialized
@@ -1631,9 +1643,7 @@ def get_long_running_output(pipeline_response):
         )
 
     @distributed_trace_async
-    async def revoke_user_delegation_keys(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, **kwargs: Any
-    ) -> None:
+    async def revoke_user_delegation_keys(self, resource_group_name: str, account_name: str, **kwargs: Any) -> None:
         """Revoke user delegation keys.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -1647,7 +1657,7 @@ async def revoke_user_delegation_keys(  # pylint: disable=inconsistent-return-st
         :rtype: None
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1669,7 +1679,6 @@ async def revoke_user_delegation_keys(  # pylint: disable=inconsistent-return-st
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/operations/_table_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/operations/_table_operations.py
index 77d60a0f77f0..387a016e1136 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/operations/_table_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/operations/_table_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
@@ -20,15 +19,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._table_operations import (
     build_create_request,
     build_delete_request,
@@ -40,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]]
 
@@ -86,7 +83,7 @@ async def create(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.Table
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -109,7 +106,6 @@ async def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -123,7 +119,7 @@ async def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("Table", pipeline_response)
+        deserialized = self._deserialize("Table", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -151,7 +147,7 @@ async def update(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.Table
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -174,7 +170,6 @@ async def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -188,7 +183,7 @@ async def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("Table", pipeline_response)
+        deserialized = self._deserialize("Table", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -214,7 +209,7 @@ async def get(self, resource_group_name: str, account_name: str, table_name: str
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.Table
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -237,7 +232,6 @@ async def get(self, resource_group_name: str, account_name: str, table_name: str
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -251,7 +245,7 @@ async def get(self, resource_group_name: str, account_name: str, table_name: str
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("Table", pipeline_response)
+        deserialized = self._deserialize("Table", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -259,9 +253,7 @@ async def get(self, resource_group_name: str, account_name: str, table_name: str
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, table_name: str, **kwargs: Any
-    ) -> None:
+    async def delete(self, resource_group_name: str, account_name: str, table_name: str, **kwargs: Any) -> None:
         """Deletes the table with the specified table name, under the specified account if it exists.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -279,7 +271,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,
@@ -302,7 +294,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -340,7 +331,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> As
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-06-01"))
         cls: ClsType[_models.ListTableResource] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -359,7 +350,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -375,7 +365,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/operations/_table_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/operations/_table_services_operations.py
index c963d9020144..a23500630384 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/operations/_table_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/operations/_table_services_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,
@@ -19,14 +18,12 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._table_services_operations import (
     build_get_service_properties_request,
     build_list_request,
@@ -36,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]]
 
@@ -76,7 +73,7 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.ListTableServices
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -98,7 +95,6 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -112,7 +108,7 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListTableServices", pipeline_response)
+        deserialized = self._deserialize("ListTableServices", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -219,7 +215,7 @@ async def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.TableServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -254,7 +250,6 @@ async def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -268,7 +263,7 @@ async def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("TableServiceProperties", pipeline_response)
+        deserialized = self._deserialize("TableServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -296,7 +291,7 @@ async def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.TableServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -319,7 +314,6 @@ async def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -333,7 +327,7 @@ async def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("TableServiceProperties", pipeline_response)
+        deserialized = self._deserialize("TableServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/operations/_usages_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/operations/_usages_operations.py
index b6ec73020f96..9f85d2933d86 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/operations/_usages_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/aio/operations/_usages_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
@@ -20,20 +19,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._usages_operations import build_list_by_location_request
 
 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 +72,7 @@ def list_by_location(self, location: str, **kwargs: Any) -> AsyncIterable["_mode
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-06-01"))
         cls: ClsType[_models.UsageListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -93,7 +90,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -109,7 +105,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/models/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/models/__init__.py
index dbc63ffaee2b..360aa83fd23b 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/models/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/models/__init__.py
@@ -5,178 +5,189 @@
 # 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 AccountSasParameters
-from ._models_py3 import ActiveDirectoryProperties
-from ._models_py3 import AzureEntityResource
-from ._models_py3 import AzureFilesIdentityBasedAuthentication
-from ._models_py3 import BlobContainer
-from ._models_py3 import BlobInventoryPolicy
-from ._models_py3 import BlobInventoryPolicyDefinition
-from ._models_py3 import BlobInventoryPolicyFilter
-from ._models_py3 import BlobInventoryPolicyRule
-from ._models_py3 import BlobInventoryPolicySchema
-from ._models_py3 import BlobRestoreParameters
-from ._models_py3 import BlobRestoreRange
-from ._models_py3 import BlobRestoreStatus
-from ._models_py3 import BlobServiceItems
-from ._models_py3 import BlobServiceProperties
-from ._models_py3 import ChangeFeed
-from ._models_py3 import CheckNameAvailabilityResult
-from ._models_py3 import CloudErrorBody
-from ._models_py3 import CorsRule
-from ._models_py3 import CorsRules
-from ._models_py3 import CustomDomain
-from ._models_py3 import DateAfterCreation
-from ._models_py3 import DateAfterModification
-from ._models_py3 import DeleteRetentionPolicy
-from ._models_py3 import DeletedShare
-from ._models_py3 import Dimension
-from ._models_py3 import Encryption
-from ._models_py3 import EncryptionScope
-from ._models_py3 import EncryptionScopeKeyVaultProperties
-from ._models_py3 import EncryptionScopeListResult
-from ._models_py3 import EncryptionService
-from ._models_py3 import EncryptionServices
-from ._models_py3 import Endpoints
-from ._models_py3 import ErrorResponse
-from ._models_py3 import ErrorResponseBody
-from ._models_py3 import FileServiceItems
-from ._models_py3 import FileServiceProperties
-from ._models_py3 import FileShare
-from ._models_py3 import FileShareItem
-from ._models_py3 import FileShareItems
-from ._models_py3 import GeoReplicationStats
-from ._models_py3 import IPRule
-from ._models_py3 import Identity
-from ._models_py3 import ImmutabilityPolicy
-from ._models_py3 import ImmutabilityPolicyProperties
-from ._models_py3 import KeyVaultProperties
-from ._models_py3 import LastAccessTimeTrackingPolicy
-from ._models_py3 import LeaseContainerRequest
-from ._models_py3 import LeaseContainerResponse
-from ._models_py3 import LegalHold
-from ._models_py3 import LegalHoldProperties
-from ._models_py3 import ListAccountSasResponse
-from ._models_py3 import ListBlobInventoryPolicy
-from ._models_py3 import ListContainerItem
-from ._models_py3 import ListContainerItems
-from ._models_py3 import ListQueue
-from ._models_py3 import ListQueueResource
-from ._models_py3 import ListQueueServices
-from ._models_py3 import ListServiceSasResponse
-from ._models_py3 import ListTableResource
-from ._models_py3 import ListTableServices
-from ._models_py3 import ManagementPolicy
-from ._models_py3 import ManagementPolicyAction
-from ._models_py3 import ManagementPolicyBaseBlob
-from ._models_py3 import ManagementPolicyDefinition
-from ._models_py3 import ManagementPolicyFilter
-from ._models_py3 import ManagementPolicyRule
-from ._models_py3 import ManagementPolicySchema
-from ._models_py3 import ManagementPolicySnapShot
-from ._models_py3 import ManagementPolicyVersion
-from ._models_py3 import MetricSpecification
-from ._models_py3 import NetworkRuleSet
-from ._models_py3 import ObjectReplicationPolicies
-from ._models_py3 import ObjectReplicationPolicy
-from ._models_py3 import ObjectReplicationPolicyFilter
-from ._models_py3 import ObjectReplicationPolicyRule
-from ._models_py3 import Operation
-from ._models_py3 import OperationDisplay
-from ._models_py3 import OperationListResult
-from ._models_py3 import PrivateEndpoint
-from ._models_py3 import PrivateEndpointConnection
-from ._models_py3 import PrivateEndpointConnectionListResult
-from ._models_py3 import PrivateLinkResource
-from ._models_py3 import PrivateLinkResourceListResult
-from ._models_py3 import PrivateLinkServiceConnectionState
-from ._models_py3 import QueueServiceProperties
-from ._models_py3 import Resource
-from ._models_py3 import RestorePolicyProperties
-from ._models_py3 import Restriction
-from ._models_py3 import RoutingPreference
-from ._models_py3 import SKUCapability
-from ._models_py3 import ServiceSasParameters
-from ._models_py3 import ServiceSpecification
-from ._models_py3 import Sku
-from ._models_py3 import SkuInformation
-from ._models_py3 import StorageAccount
-from ._models_py3 import StorageAccountCheckNameAvailabilityParameters
-from ._models_py3 import StorageAccountCreateParameters
-from ._models_py3 import StorageAccountInternetEndpoints
-from ._models_py3 import StorageAccountKey
-from ._models_py3 import StorageAccountListKeysResult
-from ._models_py3 import StorageAccountListResult
-from ._models_py3 import StorageAccountMicrosoftEndpoints
-from ._models_py3 import StorageAccountRegenerateKeyParameters
-from ._models_py3 import StorageAccountUpdateParameters
-from ._models_py3 import StorageQueue
-from ._models_py3 import StorageSkuListResult
-from ._models_py3 import SystemData
-from ._models_py3 import Table
-from ._models_py3 import TableServiceProperties
-from ._models_py3 import TagFilter
-from ._models_py3 import TagProperty
-from ._models_py3 import TrackedResource
-from ._models_py3 import UpdateHistoryProperty
-from ._models_py3 import Usage
-from ._models_py3 import UsageListResult
-from ._models_py3 import UsageName
-from ._models_py3 import VirtualNetworkRule
+from typing import TYPE_CHECKING
 
-from ._storage_management_client_enums import AccessTier
-from ._storage_management_client_enums import AccountStatus
-from ._storage_management_client_enums import BlobInventoryPolicyName
-from ._storage_management_client_enums import BlobRestoreProgressStatus
-from ._storage_management_client_enums import Bypass
-from ._storage_management_client_enums import CorsRuleAllowedMethodsItem
-from ._storage_management_client_enums import CreatedByType
-from ._storage_management_client_enums import DefaultAction
-from ._storage_management_client_enums import DirectoryServiceOptions
-from ._storage_management_client_enums import EnabledProtocols
-from ._storage_management_client_enums import EncryptionScopeSource
-from ._storage_management_client_enums import EncryptionScopeState
-from ._storage_management_client_enums import Enum27
-from ._storage_management_client_enums import GeoReplicationStatus
-from ._storage_management_client_enums import HttpProtocol
-from ._storage_management_client_enums import ImmutabilityPolicyState
-from ._storage_management_client_enums import ImmutabilityPolicyUpdateType
-from ._storage_management_client_enums import InventoryRuleType
-from ._storage_management_client_enums import KeyPermission
-from ._storage_management_client_enums import KeySource
-from ._storage_management_client_enums import KeyType
-from ._storage_management_client_enums import Kind
-from ._storage_management_client_enums import LargeFileSharesState
-from ._storage_management_client_enums import LeaseContainerRequestAction
-from ._storage_management_client_enums import LeaseDuration
-from ._storage_management_client_enums import LeaseState
-from ._storage_management_client_enums import LeaseStatus
-from ._storage_management_client_enums import ListContainersInclude
-from ._storage_management_client_enums import ManagementPolicyName
-from ._storage_management_client_enums import MinimumTlsVersion
-from ._storage_management_client_enums import Name
-from ._storage_management_client_enums import Permissions
-from ._storage_management_client_enums import PrivateEndpointConnectionProvisioningState
-from ._storage_management_client_enums import PrivateEndpointServiceConnectionStatus
-from ._storage_management_client_enums import ProvisioningState
-from ._storage_management_client_enums import PublicAccess
-from ._storage_management_client_enums import Reason
-from ._storage_management_client_enums import ReasonCode
-from ._storage_management_client_enums import RootSquashType
-from ._storage_management_client_enums import RoutingChoice
-from ._storage_management_client_enums import RuleType
-from ._storage_management_client_enums import Services
-from ._storage_management_client_enums import ShareAccessTier
-from ._storage_management_client_enums import SignedResource
-from ._storage_management_client_enums import SignedResourceTypes
-from ._storage_management_client_enums import SkuName
-from ._storage_management_client_enums import SkuTier
-from ._storage_management_client_enums import State
-from ._storage_management_client_enums import StorageAccountExpand
-from ._storage_management_client_enums import UsageUnit
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+
+from ._models_py3 import (  # type: ignore
+    AccountSasParameters,
+    ActiveDirectoryProperties,
+    AzureEntityResource,
+    AzureFilesIdentityBasedAuthentication,
+    BlobContainer,
+    BlobInventoryPolicy,
+    BlobInventoryPolicyDefinition,
+    BlobInventoryPolicyFilter,
+    BlobInventoryPolicyRule,
+    BlobInventoryPolicySchema,
+    BlobRestoreParameters,
+    BlobRestoreRange,
+    BlobRestoreStatus,
+    BlobServiceItems,
+    BlobServiceProperties,
+    ChangeFeed,
+    CheckNameAvailabilityResult,
+    CloudErrorBody,
+    CorsRule,
+    CorsRules,
+    CustomDomain,
+    DateAfterCreation,
+    DateAfterModification,
+    DeleteRetentionPolicy,
+    DeletedShare,
+    Dimension,
+    Encryption,
+    EncryptionScope,
+    EncryptionScopeKeyVaultProperties,
+    EncryptionScopeListResult,
+    EncryptionService,
+    EncryptionServices,
+    Endpoints,
+    ErrorResponse,
+    ErrorResponseBody,
+    FileServiceItems,
+    FileServiceProperties,
+    FileShare,
+    FileShareItem,
+    FileShareItems,
+    GeoReplicationStats,
+    IPRule,
+    Identity,
+    ImmutabilityPolicy,
+    ImmutabilityPolicyProperties,
+    KeyVaultProperties,
+    LastAccessTimeTrackingPolicy,
+    LeaseContainerRequest,
+    LeaseContainerResponse,
+    LegalHold,
+    LegalHoldProperties,
+    ListAccountSasResponse,
+    ListBlobInventoryPolicy,
+    ListContainerItem,
+    ListContainerItems,
+    ListQueue,
+    ListQueueResource,
+    ListQueueServices,
+    ListServiceSasResponse,
+    ListTableResource,
+    ListTableServices,
+    ManagementPolicy,
+    ManagementPolicyAction,
+    ManagementPolicyBaseBlob,
+    ManagementPolicyDefinition,
+    ManagementPolicyFilter,
+    ManagementPolicyRule,
+    ManagementPolicySchema,
+    ManagementPolicySnapShot,
+    ManagementPolicyVersion,
+    MetricSpecification,
+    NetworkRuleSet,
+    ObjectReplicationPolicies,
+    ObjectReplicationPolicy,
+    ObjectReplicationPolicyFilter,
+    ObjectReplicationPolicyRule,
+    Operation,
+    OperationDisplay,
+    OperationListResult,
+    PrivateEndpoint,
+    PrivateEndpointConnection,
+    PrivateEndpointConnectionListResult,
+    PrivateLinkResource,
+    PrivateLinkResourceListResult,
+    PrivateLinkServiceConnectionState,
+    QueueServiceProperties,
+    Resource,
+    RestorePolicyProperties,
+    Restriction,
+    RoutingPreference,
+    SKUCapability,
+    ServiceSasParameters,
+    ServiceSpecification,
+    Sku,
+    SkuInformation,
+    StorageAccount,
+    StorageAccountCheckNameAvailabilityParameters,
+    StorageAccountCreateParameters,
+    StorageAccountInternetEndpoints,
+    StorageAccountKey,
+    StorageAccountListKeysResult,
+    StorageAccountListResult,
+    StorageAccountMicrosoftEndpoints,
+    StorageAccountRegenerateKeyParameters,
+    StorageAccountUpdateParameters,
+    StorageQueue,
+    StorageSkuListResult,
+    SystemData,
+    Table,
+    TableServiceProperties,
+    TagFilter,
+    TagProperty,
+    TrackedResource,
+    UpdateHistoryProperty,
+    Usage,
+    UsageListResult,
+    UsageName,
+    VirtualNetworkRule,
+)
+
+from ._storage_management_client_enums import (  # type: ignore
+    AccessTier,
+    AccountStatus,
+    BlobInventoryPolicyName,
+    BlobRestoreProgressStatus,
+    Bypass,
+    CorsRuleAllowedMethodsItem,
+    CreatedByType,
+    DefaultAction,
+    DirectoryServiceOptions,
+    EnabledProtocols,
+    EncryptionScopeSource,
+    EncryptionScopeState,
+    Enum27,
+    GeoReplicationStatus,
+    HttpProtocol,
+    ImmutabilityPolicyState,
+    ImmutabilityPolicyUpdateType,
+    InventoryRuleType,
+    KeyPermission,
+    KeySource,
+    KeyType,
+    Kind,
+    LargeFileSharesState,
+    LeaseContainerRequestAction,
+    LeaseDuration,
+    LeaseState,
+    LeaseStatus,
+    ListContainersInclude,
+    ManagementPolicyName,
+    MinimumTlsVersion,
+    Name,
+    Permissions,
+    PrivateEndpointConnectionProvisioningState,
+    PrivateEndpointServiceConnectionStatus,
+    ProvisioningState,
+    PublicAccess,
+    Reason,
+    ReasonCode,
+    RootSquashType,
+    RoutingChoice,
+    RuleType,
+    Services,
+    ShareAccessTier,
+    SignedResource,
+    SignedResourceTypes,
+    SkuName,
+    SkuTier,
+    State,
+    StorageAccountExpand,
+    UsageUnit,
+)
 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__ = [
@@ -349,5 +360,5 @@
     "StorageAccountExpand",
     "UsageUnit",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/models/_models_py3.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/models/_models_py3.py
index d06c275402f9..7b0ceea0610c 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/models/_models_py3.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/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
 
 
@@ -309,7 +308,7 @@ def __init__(
         self.active_directory_properties = active_directory_properties
 
 
-class BlobContainer(AzureEntityResource):  # pylint: disable=too-many-instance-attributes
+class BlobContainer(AzureEntityResource):
     """Properties of the blob container, including Id, resource name, resource type, Etag.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -819,7 +818,7 @@ def __init__(self, **kwargs: Any) -> None:
         self.value = None
 
 
-class BlobServiceProperties(Resource):  # pylint: disable=too-many-instance-attributes
+class BlobServiceProperties(Resource):
     """The properties of a storage account’s Blob service.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -1866,7 +1865,7 @@ def __init__(
         self.share_delete_retention_policy = share_delete_retention_policy
 
 
-class FileShare(AzureEntityResource):  # pylint: disable=too-many-instance-attributes
+class FileShare(AzureEntityResource):
     """Properties of the file share, including Id, resource name, resource type, Etag.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -1994,7 +1993,7 @@ def __init__(
         self.share_usage_bytes = None
 
 
-class FileShareItem(AzureEntityResource):  # pylint: disable=too-many-instance-attributes
+class FileShareItem(AzureEntityResource):
     """The file share properties be listed out.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -2526,7 +2525,7 @@ class LeaseContainerRequest(_serialization.Model):
     All required parameters must be populated in order to send to server.
 
     :ivar action: Specifies the lease action. Can be one of the available actions. Required. Known
-     values are: "Acquire", "Renew", "Change", "Release", and "Break".
+     values are: "Acquire", "Renew", "Change", "Release", "Break", and "Break".
     :vartype action: str or ~azure.mgmt.storage.v2019_06_01.models.LeaseContainerRequestAction
     :ivar lease_id: Identifies the lease. Can be specified in any valid GUID string format.
     :vartype lease_id: str
@@ -2565,7 +2564,7 @@ def __init__(
     ) -> None:
         """
         :keyword action: Specifies the lease action. Can be one of the available actions. Required.
-         Known values are: "Acquire", "Renew", "Change", "Release", and "Break".
+         Known values are: "Acquire", "Renew", "Change", "Release", "Break", and "Break".
         :paramtype action: str or ~azure.mgmt.storage.v2019_06_01.models.LeaseContainerRequestAction
         :keyword lease_id: Identifies the lease. Can be specified in any valid GUID string format.
         :paramtype lease_id: str
@@ -2734,7 +2733,7 @@ def __init__(self, **kwargs: Any) -> None:
         self.value = None
 
 
-class ListContainerItem(AzureEntityResource):  # pylint: disable=too-many-instance-attributes
+class ListContainerItem(AzureEntityResource):
     """The blob container properties be listed out.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -4306,7 +4305,7 @@ def __init__(
         self.publish_internet_endpoints = publish_internet_endpoints
 
 
-class ServiceSasParameters(_serialization.Model):  # pylint: disable=too-many-instance-attributes
+class ServiceSasParameters(_serialization.Model):
     """The parameters to list service SAS credentials of a specific resource.
 
     All required parameters must be populated in order to send to server.
@@ -4691,7 +4690,7 @@ def __init__(self, *, location: str, tags: Optional[Dict[str, str]] = None, **kw
         self.location = location
 
 
-class StorageAccount(TrackedResource):  # pylint: disable=too-many-instance-attributes
+class StorageAccount(TrackedResource):
     """The storage account.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -4983,7 +4982,7 @@ def __init__(self, *, name: str, **kwargs: Any) -> None:
         self.name = name
 
 
-class StorageAccountCreateParameters(_serialization.Model):  # pylint: disable=too-many-instance-attributes
+class StorageAccountCreateParameters(_serialization.Model):
     """The parameters used when creating a storage account.
 
     All required parameters must be populated in order to send to server.
@@ -5380,7 +5379,7 @@ def __init__(self, *, key_name: str, **kwargs: Any) -> None:
         self.key_name = key_name
 
 
-class StorageAccountUpdateParameters(_serialization.Model):  # pylint: disable=too-many-instance-attributes
+class StorageAccountUpdateParameters(_serialization.Model):
     """The parameters that can be provided when updating the storage account properties.
 
     :ivar sku: Gets or sets the SKU name. Note that the SKU name cannot be updated to Standard_ZRS,
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/models/_storage_management_client_enums.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/models/_storage_management_client_enums.py
index 271d93200c6f..34de227f647d 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/models/_storage_management_client_enums.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/models/_storage_management_client_enums.py
@@ -215,6 +215,7 @@ class LeaseContainerRequestAction(str, Enum, metaclass=CaseInsensitiveEnumMeta):
     RENEW = "Renew"
     CHANGE = "Change"
     RELEASE = "Release"
+    BREAK = "Break"
     BREAK_ENUM = "Break"
 
 
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/__init__.py
index d796f35045aa..b529831709ad 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/__init__.py
@@ -5,28 +5,34 @@
 # 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 ._skus_operations import SkusOperations
-from ._storage_accounts_operations import StorageAccountsOperations
-from ._usages_operations import UsagesOperations
-from ._management_policies_operations import ManagementPoliciesOperations
-from ._blob_inventory_policies_operations import BlobInventoryPoliciesOperations
-from ._private_endpoint_connections_operations import PrivateEndpointConnectionsOperations
-from ._private_link_resources_operations import PrivateLinkResourcesOperations
-from ._object_replication_policies_operations import ObjectReplicationPoliciesOperations
-from ._encryption_scopes_operations import EncryptionScopesOperations
-from ._blob_services_operations import BlobServicesOperations
-from ._blob_containers_operations import BlobContainersOperations
-from ._file_services_operations import FileServicesOperations
-from ._file_shares_operations import FileSharesOperations
-from ._queue_services_operations import QueueServicesOperations
-from ._queue_operations import QueueOperations
-from ._table_services_operations import TableServicesOperations
-from ._table_operations import TableOperations
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._operations import Operations  # type: ignore
+from ._skus_operations import SkusOperations  # type: ignore
+from ._storage_accounts_operations import StorageAccountsOperations  # type: ignore
+from ._usages_operations import UsagesOperations  # type: ignore
+from ._management_policies_operations import ManagementPoliciesOperations  # type: ignore
+from ._blob_inventory_policies_operations import BlobInventoryPoliciesOperations  # type: ignore
+from ._private_endpoint_connections_operations import PrivateEndpointConnectionsOperations  # type: ignore
+from ._private_link_resources_operations import PrivateLinkResourcesOperations  # type: ignore
+from ._object_replication_policies_operations import ObjectReplicationPoliciesOperations  # type: ignore
+from ._encryption_scopes_operations import EncryptionScopesOperations  # type: ignore
+from ._blob_services_operations import BlobServicesOperations  # type: ignore
+from ._blob_containers_operations import BlobContainersOperations  # type: ignore
+from ._file_services_operations import FileServicesOperations  # type: ignore
+from ._file_shares_operations import FileSharesOperations  # type: ignore
+from ._queue_services_operations import QueueServicesOperations  # type: ignore
+from ._queue_operations import QueueOperations  # type: ignore
+from ._table_services_operations import TableServicesOperations  # type: ignore
+from ._table_operations import TableOperations  # 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__ = [
@@ -49,5 +55,5 @@
     "TableServicesOperations",
     "TableOperations",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_blob_containers_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_blob_containers_operations.py
index 26b074873968..a16a6a862cf5 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_blob_containers_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_blob_containers_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,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 (
@@ -21,20 +21,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -613,7 +611,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-06-01"))
         cls: ClsType[_models.ListContainerItems] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -635,7 +633,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -651,7 +648,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -786,7 +782,7 @@ def create(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -821,7 +817,6 @@ def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -835,11 +830,7 @@ def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("BlobContainer", pipeline_response)
-
-        if response.status_code == 201:
-            deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -949,7 +940,7 @@ def update(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -984,7 +975,6 @@ def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -998,7 +988,7 @@ def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1027,7 +1017,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1050,7 +1040,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1064,7 +1053,7 @@ def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1093,7 +1082,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,
@@ -1116,7 +1105,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1239,7 +1227,7 @@ def set_legal_hold(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.LegalHold
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1274,7 +1262,6 @@ def set_legal_hold(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1288,7 +1275,7 @@ def set_legal_hold(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LegalHold", pipeline_response)
+        deserialized = self._deserialize("LegalHold", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1398,7 +1385,7 @@ def clear_legal_hold(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.LegalHold
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1433,7 +1420,6 @@ def clear_legal_hold(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1447,7 +1433,7 @@ def clear_legal_hold(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LegalHold", pipeline_response)
+        deserialized = self._deserialize("LegalHold", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1586,7 +1572,7 @@ def create_or_update_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1626,7 +1612,6 @@ def create_or_update_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1643,7 +1628,7 @@ def create_or_update_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1686,7 +1671,7 @@ def get_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1711,7 +1696,6 @@ def get_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1728,7 +1712,7 @@ def get_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1773,7 +1757,7 @@ def delete_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1798,7 +1782,6 @@ def delete_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1815,7 +1798,7 @@ def delete_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1849,7 +1832,7 @@ def lock_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1873,7 +1856,6 @@ def lock_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1890,7 +1872,7 @@ def lock_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -2020,7 +2002,7 @@ def extend_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -2059,7 +2041,6 @@ def extend_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -2076,7 +2057,7 @@ def extend_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -2186,7 +2167,7 @@ def lease(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.LeaseContainerResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -2224,7 +2205,6 @@ def lease(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -2238,7 +2218,7 @@ def lease(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LeaseContainerResponse", pipeline_response)
+        deserialized = self._deserialize("LeaseContainerResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_blob_inventory_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_blob_inventory_policies_operations.py
index 383488aaa12b..f9a00b406b52 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_blob_inventory_policies_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_blob_inventory_policies_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 (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -235,7 +232,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.BlobInventoryPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -258,7 +255,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -273,7 +269,7 @@ def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response)
+        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -377,7 +373,7 @@ def create_or_update(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.BlobInventoryPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -412,7 +408,6 @@ def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -427,7 +422,7 @@ def create_or_update(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response)
+        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -459,7 +454,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,
@@ -482,7 +477,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -524,7 +518,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-06-01"))
         cls: ClsType[_models.ListBlobInventoryPolicy] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -543,7 +537,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -559,7 +552,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_blob_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_blob_services_operations.py
index 41e0e68b4474..f2304f16fdaa 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_blob_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_blob_services_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 (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -197,7 +194,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-06-01"))
         cls: ClsType[_models.BlobServiceItems] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -216,7 +213,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -232,7 +228,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -361,7 +356,7 @@ def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.BlobServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -396,7 +391,6 @@ def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -410,7 +404,7 @@ def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobServiceProperties", pipeline_response)
+        deserialized = self._deserialize("BlobServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -438,7 +432,7 @@ def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.BlobServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -461,7 +455,6 @@ def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -475,7 +468,7 @@ def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobServiceProperties", pipeline_response)
+        deserialized = self._deserialize("BlobServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_encryption_scopes_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_encryption_scopes_operations.py
index b224181206c6..b90f6eb98ac2 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_encryption_scopes_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_encryption_scopes_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 (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -315,7 +312,7 @@ def put(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.EncryptionScope
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -350,7 +347,6 @@ def put(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -365,11 +361,7 @@ def put(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("EncryptionScope", pipeline_response)
-
-        if response.status_code == 201:
-            deserialized = self._deserialize("EncryptionScope", pipeline_response)
+        deserialized = self._deserialize("EncryptionScope", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -479,7 +471,7 @@ def patch(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.EncryptionScope
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -514,7 +506,6 @@ def patch(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -529,7 +520,7 @@ def patch(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("EncryptionScope", pipeline_response)
+        deserialized = self._deserialize("EncryptionScope", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -558,7 +549,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.EncryptionScope
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -581,7 +572,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -596,7 +586,7 @@ def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("EncryptionScope", pipeline_response)
+        deserialized = self._deserialize("EncryptionScope", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -624,7 +614,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> It
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-06-01"))
         cls: ClsType[_models.EncryptionScopeListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -643,7 +633,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -659,7 +648,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_file_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_file_services_operations.py
index 772b2df7e48d..425d4b6eeab3 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_file_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_file_services_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,
@@ -19,20 +18,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -185,7 +182,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.FileServiceItems
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -207,7 +204,6 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -221,7 +217,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileServiceItems", pipeline_response)
+        deserialized = self._deserialize("FileServiceItems", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -328,7 +324,7 @@ def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.FileServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -363,7 +359,6 @@ def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -377,7 +372,7 @@ def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileServiceProperties", pipeline_response)
+        deserialized = self._deserialize("FileServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -405,7 +400,7 @@ def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.FileServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -428,7 +423,6 @@ def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -442,7 +436,7 @@ def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileServiceProperties", pipeline_response)
+        deserialized = self._deserialize("FileServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_file_shares_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_file_shares_operations.py
index fd68206b02f0..3eea0da95c0f 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_file_shares_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_file_shares_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, Literal, Optional, Type, TypeVar, Union, overload
+from typing import Any, Callable, Dict, IO, Iterable, Literal, Optional, TypeVar, Union, overload
 import urllib.parse
 
 from azure.core.exceptions import (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -333,7 +330,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-06-01"))
         cls: ClsType[_models.FileShareItems] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -355,7 +352,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -371,7 +367,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -506,7 +501,7 @@ def create(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.FileShare
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -541,7 +536,6 @@ def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -555,11 +549,7 @@ def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("FileShare", pipeline_response)
-
-        if response.status_code == 201:
-            deserialized = self._deserialize("FileShare", pipeline_response)
+        deserialized = self._deserialize("FileShare", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -669,7 +659,7 @@ def update(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.FileShare
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -704,7 +694,6 @@ def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -718,7 +707,7 @@ def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileShare", pipeline_response)
+        deserialized = self._deserialize("FileShare", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -755,7 +744,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.FileShare
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -779,7 +768,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -793,7 +781,7 @@ def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileShare", pipeline_response)
+        deserialized = self._deserialize("FileShare", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -822,7 +810,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,
@@ -845,7 +833,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -863,7 +850,7 @@ def delete(  # pylint: disable=inconsistent-return-statements
             return cls(pipeline_response, None, {})  # type: ignore
 
     @overload
-    def restore(  # pylint: disable=inconsistent-return-statements
+    def restore(
         self,
         resource_group_name: str,
         account_name: str,
@@ -898,7 +885,7 @@ def restore(  # pylint: disable=inconsistent-return-statements
         """
 
     @overload
-    def restore(  # pylint: disable=inconsistent-return-statements
+    def restore(
         self,
         resource_group_name: str,
         account_name: str,
@@ -961,7 +948,7 @@ def restore(  # 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,
@@ -996,7 +983,6 @@ def restore(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_management_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_management_policies_operations.py
index 09fccc66fd88..ee8da8d05022 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_management_policies_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_management_policies_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,
@@ -19,20 +18,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -196,7 +193,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.ManagementPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -219,7 +216,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -233,7 +229,7 @@ def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ManagementPolicy", pipeline_response)
+        deserialized = self._deserialize("ManagementPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -337,7 +333,7 @@ def create_or_update(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.ManagementPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -372,7 +368,6 @@ def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -386,7 +381,7 @@ def create_or_update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ManagementPolicy", pipeline_response)
+        deserialized = self._deserialize("ManagementPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -418,7 +413,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,
@@ -441,7 +436,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_object_replication_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_object_replication_policies_operations.py
index 3f8ed2716e0d..0c75031986b2 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_object_replication_policies_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_object_replication_policies_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 (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -229,7 +226,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-06-01"))
         cls: ClsType[_models.ObjectReplicationPolicies] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -248,7 +245,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -264,7 +260,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -314,7 +309,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.ObjectReplicationPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -337,7 +332,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -352,7 +346,7 @@ def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response)
+        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -456,7 +450,7 @@ def create_or_update(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.ObjectReplicationPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -491,7 +485,6 @@ def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -506,7 +499,7 @@ def create_or_update(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response)
+        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -533,7 +526,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,
@@ -556,7 +549,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_operations.py
index 848de31c5919..7bb7d7560951 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/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 (
@@ -20,20 +19,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -94,7 +91,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.Operation"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-06-01"))
         cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -110,7 +107,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -126,7 +122,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_private_endpoint_connections_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_private_endpoint_connections_operations.py
index f584679a3829..18827990c907 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_private_endpoint_connections_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_private_endpoint_connections_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 (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -241,7 +238,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-06-01"))
         cls: ClsType[_models.PrivateEndpointConnectionListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -260,7 +257,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -276,7 +272,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -325,7 +320,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.PrivateEndpointConnection
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -348,7 +343,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -363,7 +357,7 @@ def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response)
+        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -464,7 +458,7 @@ def put(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.PrivateEndpointConnection
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -499,7 +493,6 @@ def put(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -514,7 +507,7 @@ def put(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response)
+        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -541,7 +534,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,
@@ -564,7 +557,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_private_link_resources_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_private_link_resources_operations.py
index c081e4990f0b..9a138165a0a3 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_private_link_resources_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_private_link_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, Optional, Type, TypeVar
+from typing import Any, Callable, Dict, Optional, TypeVar
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -18,20 +17,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -109,7 +106,7 @@ def list_by_storage_account(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.PrivateLinkResourceListResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -131,7 +128,6 @@ def list_by_storage_account(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -145,7 +141,7 @@ def list_by_storage_account(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("PrivateLinkResourceListResult", pipeline_response)
+        deserialized = self._deserialize("PrivateLinkResourceListResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_queue_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_queue_operations.py
index ef778e515b97..108047675cd8 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_queue_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_queue_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 (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -375,7 +372,7 @@ def create(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.StorageQueue
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -410,7 +407,6 @@ def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -424,7 +420,7 @@ def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageQueue", pipeline_response)
+        deserialized = self._deserialize("StorageQueue", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -531,7 +527,7 @@ def update(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.StorageQueue
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -566,7 +562,6 @@ def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -580,7 +575,7 @@ def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageQueue", pipeline_response)
+        deserialized = self._deserialize("StorageQueue", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -607,7 +602,7 @@ def get(self, resource_group_name: str, account_name: str, queue_name: str, **kw
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.StorageQueue
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -630,7 +625,6 @@ def get(self, resource_group_name: str, account_name: str, queue_name: str, **kw
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -644,7 +638,7 @@ def get(self, resource_group_name: str, account_name: str, queue_name: str, **kw
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageQueue", pipeline_response)
+        deserialized = self._deserialize("StorageQueue", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -673,7 +667,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,
@@ -696,7 +690,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -747,7 +740,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-06-01"))
         cls: ClsType[_models.ListQueueResource] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -768,7 +761,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -784,7 +776,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_queue_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_queue_services_operations.py
index 46a31e5e7a59..743f7df7ad6e 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_queue_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_queue_services_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,
@@ -19,20 +18,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -185,7 +182,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.ListQueueServices
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -207,7 +204,6 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -221,7 +217,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListQueueServices", pipeline_response)
+        deserialized = self._deserialize("ListQueueServices", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -328,7 +324,7 @@ def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.QueueServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -363,7 +359,6 @@ def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -377,7 +372,7 @@ def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("QueueServiceProperties", pipeline_response)
+        deserialized = self._deserialize("QueueServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -405,7 +400,7 @@ def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.QueueServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -428,7 +423,6 @@ def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -442,7 +436,7 @@ def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("QueueServiceProperties", pipeline_response)
+        deserialized = self._deserialize("QueueServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_skus_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_skus_operations.py
index ede0ac1a0502..780cf0bc2a45 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_skus_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_skus_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 (
@@ -20,20 +19,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -99,7 +96,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.SkuInformation"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-06-01"))
         cls: ClsType[_models.StorageSkuListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -116,7 +113,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -132,7 +128,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_storage_accounts_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_storage_accounts_operations.py
index 3c90c87564a3..713f70aaf8ee 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_storage_accounts_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_storage_accounts_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,7 @@
 # --------------------------------------------------------------------------
 from io import IOBase
 import sys
-from typing import Any, Callable, Dict, IO, Iterable, Literal, Optional, Type, TypeVar, Union, cast, overload
+from typing import Any, Callable, Dict, IO, Iterable, Iterator, Literal, Optional, TypeVar, Union, cast, overload
 import urllib.parse
 
 from azure.core.exceptions import (
@@ -17,13 +17,14 @@
     ResourceExistsError,
     ResourceNotFoundError,
     ResourceNotModifiedError,
+    StreamClosedError,
+    StreamConsumedError,
     map_error,
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
 from azure.core.polling import LROPoller, NoPolling, PollingMethod
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
@@ -31,12 +32,11 @@
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -582,7 +582,7 @@ def check_name_availability(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.CheckNameAvailabilityResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -614,7 +614,6 @@ def check_name_availability(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -628,7 +627,7 @@ def check_name_availability(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response)
+        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -641,8 +640,8 @@ def _create_initial(
         account_name: str,
         parameters: Union[_models.StorageAccountCreateParameters, IO[bytes]],
         **kwargs: Any
-    ) -> Optional[_models.StorageAccount]:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> Iterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -655,7 +654,7 @@ def _create_initial(
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-06-01"))
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
-        cls: ClsType[Optional[_models.StorageAccount]] = kwargs.pop("cls", None)
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
         _json = None
@@ -676,10 +675,10 @@ def _create_initial(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -687,12 +686,14 @@ def _create_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = None
-        if response.status_code == 200:
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -815,10 +816,11 @@ def begin_create(
                 params=_params,
                 **kwargs
             )
+            raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+            deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
             if cls:
                 return cls(pipeline_response, deserialized, {})  # type: ignore
             return deserialized
@@ -857,7 +859,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,
@@ -879,7 +881,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -924,7 +925,7 @@ def get_properties(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -947,7 +948,6 @@ def get_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -961,7 +961,7 @@ def get_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1072,7 +1072,7 @@ def update(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1106,7 +1106,6 @@ def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1120,7 +1119,7 @@ def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1142,7 +1141,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.StorageAccount"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-06-01"))
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1159,7 +1158,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -1175,7 +1173,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -1222,7 +1219,7 @@ def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> Ite
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-06-01"))
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1240,7 +1237,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -1256,7 +1252,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -1306,7 +1301,7 @@ def list_keys(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.StorageAccountListKeysResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1329,7 +1324,6 @@ def list_keys(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1343,7 +1337,7 @@ def list_keys(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response)
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1437,7 +1431,7 @@ def regenerate_key(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.StorageAccountListKeysResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1471,7 +1465,6 @@ def regenerate_key(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1485,7 +1478,7 @@ def regenerate_key(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response)
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1576,7 +1569,7 @@ def list_account_sas(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.ListAccountSasResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1610,7 +1603,6 @@ def list_account_sas(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1624,7 +1616,7 @@ def list_account_sas(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListAccountSasResponse", pipeline_response)
+        deserialized = self._deserialize("ListAccountSasResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1713,7 +1705,7 @@ def list_service_sas(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.ListServiceSasResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1747,7 +1739,6 @@ def list_service_sas(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1761,17 +1752,15 @@ def list_service_sas(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListServiceSasResponse", pipeline_response)
+        deserialized = self._deserialize("ListServiceSasResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
 
         return deserialized  # type: ignore
 
-    def _failover_initial(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, **kwargs: Any
-    ) -> None:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    def _failover_initial(self, resource_group_name: str, account_name: str, **kwargs: Any) -> Iterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1783,7 +1772,7 @@ def _failover_initial(  # pylint: disable=inconsistent-return-statements
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-06-01"))
-        cls: ClsType[None] = kwargs.pop("cls", None)
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
 
         _request = build_failover_request(
             resource_group_name=resource_group_name,
@@ -1793,10 +1782,10 @@ def _failover_initial(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -1804,11 +1793,19 @@ def _failover_initial(  # pylint: disable=inconsistent-return-statements
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
-            return cls(pipeline_response, None, {})  # type: ignore
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
 
     @distributed_trace
     def begin_failover(self, resource_group_name: str, account_name: str, **kwargs: Any) -> LROPoller[None]:
@@ -1836,7 +1833,7 @@ def begin_failover(self, resource_group_name: str, account_name: str, **kwargs:
         lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
         cont_token: Optional[str] = kwargs.pop("continuation_token", None)
         if cont_token is None:
-            raw_result = self._failover_initial(  # type: ignore
+            raw_result = self._failover_initial(
                 resource_group_name=resource_group_name,
                 account_name=account_name,
                 api_version=api_version,
@@ -1845,6 +1842,7 @@ def begin_failover(self, resource_group_name: str, account_name: str, **kwargs:
                 params=_params,
                 **kwargs
             )
+            raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
@@ -1874,8 +1872,8 @@ def _restore_blob_ranges_initial(
         account_name: str,
         parameters: Union[_models.BlobRestoreParameters, IO[bytes]],
         **kwargs: Any
-    ) -> _models.BlobRestoreStatus:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> Iterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1888,7 +1886,7 @@ def _restore_blob_ranges_initial(
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-06-01"))
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
-        cls: ClsType[_models.BlobRestoreStatus] = kwargs.pop("cls", None)
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
         _json = None
@@ -1909,10 +1907,10 @@ def _restore_blob_ranges_initial(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -1920,14 +1918,14 @@ def _restore_blob_ranges_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response)
-
-        if response.status_code == 202:
-            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response)
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -2040,10 +2038,11 @@ def begin_restore_blob_ranges(
                 params=_params,
                 **kwargs
             )
+            raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):
-            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response)
+            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response.http_response)
             if cls:
                 return cls(pipeline_response, deserialized, {})  # type: ignore
             return deserialized
@@ -2084,7 +2083,7 @@ def revoke_user_delegation_keys(  # pylint: disable=inconsistent-return-statemen
         :rtype: None
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -2106,7 +2105,6 @@ def revoke_user_delegation_keys(  # pylint: disable=inconsistent-return-statemen
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_table_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_table_operations.py
index a1d00fa23277..cfed91cd3a61 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_table_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_table_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 (
@@ -20,20 +19,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -255,7 +252,7 @@ def create(self, resource_group_name: str, account_name: str, table_name: str, *
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.Table
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -278,7 +275,6 @@ def create(self, resource_group_name: str, account_name: str, table_name: str, *
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -292,7 +288,7 @@ def create(self, resource_group_name: str, account_name: str, table_name: str, *
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("Table", pipeline_response)
+        deserialized = self._deserialize("Table", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -318,7 +314,7 @@ def update(self, resource_group_name: str, account_name: str, table_name: str, *
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.Table
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -341,7 +337,6 @@ def update(self, resource_group_name: str, account_name: str, table_name: str, *
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -355,7 +350,7 @@ def update(self, resource_group_name: str, account_name: str, table_name: str, *
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("Table", pipeline_response)
+        deserialized = self._deserialize("Table", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -381,7 +376,7 @@ def get(self, resource_group_name: str, account_name: str, table_name: str, **kw
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.Table
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -404,7 +399,6 @@ def get(self, resource_group_name: str, account_name: str, table_name: str, **kw
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -418,7 +412,7 @@ def get(self, resource_group_name: str, account_name: str, table_name: str, **kw
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("Table", pipeline_response)
+        deserialized = self._deserialize("Table", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -446,7 +440,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,
@@ -469,7 +463,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -507,7 +500,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> It
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-06-01"))
         cls: ClsType[_models.ListTableResource] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -526,7 +519,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -542,7 +534,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_table_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_table_services_operations.py
index dce21ddd62f1..1fde1b624d4b 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_table_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_table_services_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,
@@ -19,20 +18,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -185,7 +182,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.ListTableServices
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -207,7 +204,6 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -221,7 +217,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListTableServices", pipeline_response)
+        deserialized = self._deserialize("ListTableServices", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -328,7 +324,7 @@ def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.TableServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -363,7 +359,6 @@ def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -377,7 +372,7 @@ def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("TableServiceProperties", pipeline_response)
+        deserialized = self._deserialize("TableServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -405,7 +400,7 @@ def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2019_06_01.models.TableServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -428,7 +423,6 @@ def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -442,7 +436,7 @@ def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("TableServiceProperties", pipeline_response)
+        deserialized = self._deserialize("TableServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_usages_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_usages_operations.py
index f58068ac963b..0090323d3686 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_usages_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2019_06_01/operations/_usages_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 (
@@ -20,20 +19,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -105,7 +102,7 @@ def list_by_location(self, location: str, **kwargs: Any) -> Iterable["_models.Us
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2019-06-01"))
         cls: ClsType[_models.UsageListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -123,7 +120,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -139,7 +135,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/__init__.py
index a860a5c185c9..60980065e1ee 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/__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 ._storage_management_client import StorageManagementClient
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._storage_management_client import StorageManagementClient  # 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__ = [
     "StorageManagementClient",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/_configuration.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/_configuration.py
index 4a0b3e35fc17..ed3f1b53e8b7 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/_configuration.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/_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 StorageManagementClientConfiguration:  # pylint: disable=too-many-instance-attributes,name-too-long
+class StorageManagementClientConfiguration:  # pylint: disable=too-many-instance-attributes
     """Configuration for StorageManagementClient.
 
     Note that all parameters used to create this instance are saved as instance
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/_metadata.json b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/_metadata.json
index aa914ce4517e..3c7204ca37de 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/_metadata.json
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/_metadata.json
@@ -10,8 +10,8 @@
         "azure_arm": true,
         "has_public_lro_operations": true,
         "client_side_validation": false,
-        "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"ARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementClientConfiguration\"], \".._serialization\": [\"Deserializer\", \"Serializer\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}}",
-        "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"AsyncARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"AsyncARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementClientConfiguration\"], \"..._serialization\": [\"Deserializer\", \"Serializer\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"]}}}"
+        "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"ARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementClientConfiguration\"], \".._serialization\": [\"Deserializer\", \"Serializer\"]}, \"stdlib\": {\"typing_extensions\": [\"Self\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}}",
+        "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"AsyncARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"AsyncARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementClientConfiguration\"], \"..._serialization\": [\"Deserializer\", \"Serializer\"]}, \"stdlib\": {\"typing_extensions\": [\"Self\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"]}}}"
     },
     "global_parameters": {
         "sync": {
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/_storage_management_client.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/_storage_management_client.py
index a43fa08fb3ec..e44c372cd20f 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/_storage_management_client.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/_storage_management_client.py
@@ -8,6 +8,7 @@
 
 from copy import deepcopy
 from typing import Any, TYPE_CHECKING
+from typing_extensions import Self
 
 from azure.core.pipeline import policies
 from azure.core.rest import HttpRequest, HttpResponse
@@ -40,11 +41,10 @@
 )
 
 if TYPE_CHECKING:
-    # pylint: disable=unused-import,ungrouped-imports
     from azure.core.credentials import TokenCredential
 
 
-class StorageManagementClient:  # pylint: disable=client-accepts-api-version-keyword,too-many-instance-attributes
+class StorageManagementClient:  # pylint: disable=too-many-instance-attributes
     """The Azure Storage Management API.
 
     :ivar operations: Operations operations
@@ -226,7 +226,7 @@ def _send_request(self, request: HttpRequest, *, stream: bool = False, **kwargs:
     def close(self) -> None:
         self._client.close()
 
-    def __enter__(self) -> "StorageManagementClient":
+    def __enter__(self) -> Self:
         self._client.__enter__()
         return self
 
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/_vendor.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/_vendor.py
deleted file mode 100644
index 0dafe0e287ff..000000000000
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/_vendor.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# --------------------------------------------------------------------------
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License. See License.txt in the project root for license information.
-# Code generated by Microsoft (R) AutoRest Code Generator.
-# Changes may cause incorrect behavior and will be lost if the code is regenerated.
-# --------------------------------------------------------------------------
-
-from azure.core.pipeline.transport import HttpRequest
-
-
-def _convert_request(request, files=None):
-    data = request.content if not files else None
-    request = HttpRequest(method=request.method, url=request.url, headers=request.headers, data=data)
-    if files:
-        request.set_formdata_body(files)
-    return request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/_version.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/_version.py
index 5a163c0afedc..e5754a47ce68 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/_version.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/_version.py
@@ -6,4 +6,4 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-VERSION = "21.2.1"
\ No newline at end of file
+VERSION = "1.0.0b1"
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/__init__.py
index a5c3d2414cfd..ee2b940bd4fc 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/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 ._storage_management_client import StorageManagementClient
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._storage_management_client import StorageManagementClient  # 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__ = [
     "StorageManagementClient",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/_configuration.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/_configuration.py
index bdc48c02393e..69766daffaeb 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/_configuration.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/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 StorageManagementClientConfiguration:  # pylint: disable=too-many-instance-attributes,name-too-long
+class StorageManagementClientConfiguration:  # pylint: disable=too-many-instance-attributes
     """Configuration for StorageManagementClient.
 
     Note that all parameters used to create this instance are saved as instance
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/_storage_management_client.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/_storage_management_client.py
index 483b44c7d8ca..85cd0c9ced36 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/_storage_management_client.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/_storage_management_client.py
@@ -8,6 +8,7 @@
 
 from copy import deepcopy
 from typing import Any, Awaitable, TYPE_CHECKING
+from typing_extensions import Self
 
 from azure.core.pipeline import policies
 from azure.core.rest import AsyncHttpResponse, HttpRequest
@@ -40,11 +41,10 @@
 )
 
 if TYPE_CHECKING:
-    # pylint: disable=unused-import,ungrouped-imports
     from azure.core.credentials_async import AsyncTokenCredential
 
 
-class StorageManagementClient:  # pylint: disable=client-accepts-api-version-keyword,too-many-instance-attributes
+class StorageManagementClient:  # pylint: disable=too-many-instance-attributes
     """The Azure Storage Management API.
 
     :ivar operations: Operations operations
@@ -229,7 +229,7 @@ def _send_request(
     async def close(self) -> None:
         await self._client.close()
 
-    async def __aenter__(self) -> "StorageManagementClient":
+    async def __aenter__(self) -> Self:
         await self._client.__aenter__()
         return self
 
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/operations/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/operations/__init__.py
index 0f201012e160..d406c5bf4d6b 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/operations/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/operations/__init__.py
@@ -5,29 +5,35 @@
 # 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 ._skus_operations import SkusOperations
-from ._storage_accounts_operations import StorageAccountsOperations
-from ._deleted_accounts_operations import DeletedAccountsOperations
-from ._usages_operations import UsagesOperations
-from ._management_policies_operations import ManagementPoliciesOperations
-from ._blob_inventory_policies_operations import BlobInventoryPoliciesOperations
-from ._private_endpoint_connections_operations import PrivateEndpointConnectionsOperations
-from ._private_link_resources_operations import PrivateLinkResourcesOperations
-from ._object_replication_policies_operations import ObjectReplicationPoliciesOperations
-from ._encryption_scopes_operations import EncryptionScopesOperations
-from ._blob_services_operations import BlobServicesOperations
-from ._blob_containers_operations import BlobContainersOperations
-from ._file_services_operations import FileServicesOperations
-from ._file_shares_operations import FileSharesOperations
-from ._queue_services_operations import QueueServicesOperations
-from ._queue_operations import QueueOperations
-from ._table_services_operations import TableServicesOperations
-from ._table_operations import TableOperations
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._operations import Operations  # type: ignore
+from ._skus_operations import SkusOperations  # type: ignore
+from ._storage_accounts_operations import StorageAccountsOperations  # type: ignore
+from ._deleted_accounts_operations import DeletedAccountsOperations  # type: ignore
+from ._usages_operations import UsagesOperations  # type: ignore
+from ._management_policies_operations import ManagementPoliciesOperations  # type: ignore
+from ._blob_inventory_policies_operations import BlobInventoryPoliciesOperations  # type: ignore
+from ._private_endpoint_connections_operations import PrivateEndpointConnectionsOperations  # type: ignore
+from ._private_link_resources_operations import PrivateLinkResourcesOperations  # type: ignore
+from ._object_replication_policies_operations import ObjectReplicationPoliciesOperations  # type: ignore
+from ._encryption_scopes_operations import EncryptionScopesOperations  # type: ignore
+from ._blob_services_operations import BlobServicesOperations  # type: ignore
+from ._blob_containers_operations import BlobContainersOperations  # type: ignore
+from ._file_services_operations import FileServicesOperations  # type: ignore
+from ._file_shares_operations import FileSharesOperations  # type: ignore
+from ._queue_services_operations import QueueServicesOperations  # type: ignore
+from ._queue_operations import QueueOperations  # type: ignore
+from ._table_services_operations import TableServicesOperations  # type: ignore
+from ._table_operations import TableOperations  # 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__ = [
@@ -51,5 +57,5 @@
     "TableServicesOperations",
     "TableOperations",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/operations/_blob_containers_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/operations/_blob_containers_operations.py
index f98aac7ed733..6b03d90bc6fe 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/operations/_blob_containers_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/operations/_blob_containers_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,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
@@ -21,15 +21,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._blob_containers_operations import (
     build_clear_legal_hold_request,
     build_create_or_update_immutability_policy_request,
@@ -49,7 +47,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]]
 
@@ -116,7 +114,7 @@ def list(
         )
         cls: ClsType[_models.ListContainerItems] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -138,7 +136,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -154,7 +151,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -289,7 +285,7 @@ async def create(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -326,7 +322,6 @@ async def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -340,11 +335,7 @@ async def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("BlobContainer", pipeline_response)
-
-        if response.status_code == 201:
-            deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -454,7 +445,7 @@ async def update(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -491,7 +482,6 @@ async def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -505,7 +495,7 @@ async def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -534,7 +524,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -559,7 +549,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -573,7 +562,7 @@ async def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -581,9 +570,7 @@ async def get(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, container_name: str, **kwargs: Any
-    ) -> None:
+    async def delete(self, resource_group_name: str, account_name: str, container_name: str, **kwargs: Any) -> None:
         """Deletes specified container under its account.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -602,7 +589,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,
@@ -627,7 +614,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -750,7 +736,7 @@ async def set_legal_hold(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.LegalHold
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -787,7 +773,6 @@ async def set_legal_hold(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -801,7 +786,7 @@ async def set_legal_hold(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LegalHold", pipeline_response)
+        deserialized = self._deserialize("LegalHold", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -911,7 +896,7 @@ async def clear_legal_hold(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.LegalHold
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -948,7 +933,6 @@ async def clear_legal_hold(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -962,7 +946,7 @@ async def clear_legal_hold(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LegalHold", pipeline_response)
+        deserialized = self._deserialize("LegalHold", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1102,7 +1086,7 @@ async def create_or_update_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1144,7 +1128,6 @@ async def create_or_update_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1161,7 +1144,7 @@ async def create_or_update_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1204,7 +1187,7 @@ async def get_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1231,7 +1214,6 @@ async def get_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1248,7 +1230,7 @@ async def get_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1293,7 +1275,7 @@ async def delete_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1320,7 +1302,6 @@ async def delete_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1337,7 +1318,7 @@ async def delete_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1371,7 +1352,7 @@ async def lock_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1397,7 +1378,6 @@ async def lock_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1414,7 +1394,7 @@ async def lock_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1545,7 +1525,7 @@ async def extend_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1586,7 +1566,6 @@ async def extend_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1603,7 +1582,7 @@ async def extend_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1714,7 +1693,7 @@ async def lease(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.LeaseContainerResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1754,7 +1733,6 @@ async def lease(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1768,7 +1746,7 @@ async def lease(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LeaseContainerResponse", pipeline_response)
+        deserialized = self._deserialize("LeaseContainerResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/operations/_blob_inventory_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/operations/_blob_inventory_policies_operations.py
index b98a53175929..642e35957084 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/operations/_blob_inventory_policies_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/operations/_blob_inventory_policies_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._blob_inventory_policies_operations import (
     build_create_or_update_request,
     build_delete_request,
@@ -40,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]]
 
@@ -90,7 +87,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.BlobInventoryPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -115,7 +112,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -130,7 +126,7 @@ async def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response)
+        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -235,7 +231,7 @@ async def create_or_update(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.BlobInventoryPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -272,7 +268,6 @@ async def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -287,7 +282,7 @@ async def create_or_update(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response)
+        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -295,7 +290,7 @@ async def create_or_update(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
+    async def delete(
         self,
         resource_group_name: str,
         account_name: str,
@@ -319,7 +314,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,
@@ -344,7 +339,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -388,7 +382,7 @@ def list(
         )
         cls: ClsType[_models.ListBlobInventoryPolicy] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -407,7 +401,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -423,7 +416,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/operations/_blob_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/operations/_blob_services_operations.py
index bcd6febea05d..ecd98dee4746 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/operations/_blob_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/operations/_blob_services_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._blob_services_operations import (
     build_get_service_properties_request,
     build_list_request,
@@ -39,7 +36,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]]
 
@@ -91,7 +88,7 @@ def list(
         )
         cls: ClsType[_models.BlobServiceItems] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -110,7 +107,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -126,7 +122,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -256,7 +251,7 @@ async def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.BlobServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -293,7 +288,6 @@ async def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -307,7 +301,7 @@ async def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobServiceProperties", pipeline_response)
+        deserialized = self._deserialize("BlobServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -335,7 +329,7 @@ async def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.BlobServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -360,7 +354,6 @@ async def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -374,7 +367,7 @@ async def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobServiceProperties", pipeline_response)
+        deserialized = self._deserialize("BlobServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/operations/_deleted_accounts_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/operations/_deleted_accounts_operations.py
index c3602679dd2d..86744136ce00 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/operations/_deleted_accounts_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/operations/_deleted_accounts_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
@@ -20,21 +19,19 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._deleted_accounts_operations import build_get_request, build_list_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
 
@@ -76,7 +73,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.DeletedAccount"]:
         )
         cls: ClsType[_models.DeletedAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -93,7 +90,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -109,7 +105,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -151,7 +146,7 @@ async def get(self, deleted_account_name: str, location: str, **kwargs: Any) ->
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.DeletedAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -175,7 +170,6 @@ async def get(self, deleted_account_name: str, location: str, **kwargs: Any) ->
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -190,7 +184,7 @@ async def get(self, deleted_account_name: str, location: str, **kwargs: Any) ->
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("DeletedAccount", pipeline_response)
+        deserialized = self._deserialize("DeletedAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/operations/_encryption_scopes_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/operations/_encryption_scopes_operations.py
index f619f3c3646c..bff1b304008a 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/operations/_encryption_scopes_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/operations/_encryption_scopes_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._encryption_scopes_operations import (
     build_get_request,
     build_list_request,
@@ -40,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]]
 
@@ -174,7 +171,7 @@ async def put(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.EncryptionScope
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -211,7 +208,6 @@ async def put(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -226,11 +222,7 @@ async def put(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("EncryptionScope", pipeline_response)
-
-        if response.status_code == 201:
-            deserialized = self._deserialize("EncryptionScope", pipeline_response)
+        deserialized = self._deserialize("EncryptionScope", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -341,7 +333,7 @@ async def patch(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.EncryptionScope
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -378,7 +370,6 @@ async def patch(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -393,7 +384,7 @@ async def patch(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("EncryptionScope", pipeline_response)
+        deserialized = self._deserialize("EncryptionScope", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -422,7 +413,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.EncryptionScope
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -447,7 +438,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -462,7 +452,7 @@ async def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("EncryptionScope", pipeline_response)
+        deserialized = self._deserialize("EncryptionScope", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -495,7 +485,7 @@ def list(
         )
         cls: ClsType[_models.EncryptionScopeListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -514,7 +504,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -530,7 +519,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/operations/_file_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/operations/_file_services_operations.py
index e64ba9df11df..5dbfc39be4be 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/operations/_file_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/operations/_file_services_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,
@@ -19,14 +18,12 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._file_services_operations import (
     build_get_service_properties_request,
     build_list_request,
@@ -36,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]]
 
@@ -76,7 +73,7 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.FileServiceItems
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -100,7 +97,6 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -114,7 +110,7 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileServiceItems", pipeline_response)
+        deserialized = self._deserialize("FileServiceItems", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -222,7 +218,7 @@ async def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.FileServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -259,7 +255,6 @@ async def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -273,7 +268,7 @@ async def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileServiceProperties", pipeline_response)
+        deserialized = self._deserialize("FileServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -301,7 +296,7 @@ async def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.FileServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -326,7 +321,6 @@ async def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -340,7 +334,7 @@ async def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileServiceProperties", pipeline_response)
+        deserialized = self._deserialize("FileServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/operations/_file_shares_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/operations/_file_shares_operations.py
index 2118a2e7f253..0c96eaf0b25d 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/operations/_file_shares_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/operations/_file_shares_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, Literal, Optional, Type, TypeVar, Union, overload
+from typing import Any, AsyncIterable, Callable, Dict, IO, Literal, Optional, TypeVar, Union, overload
 import urllib.parse
 
 from azure.core.async_paging import AsyncItemPaged, AsyncList
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._file_shares_operations import (
     build_create_request,
     build_delete_request,
@@ -42,7 +39,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]]
 
@@ -108,7 +105,7 @@ def list(
         )
         cls: ClsType[_models.FileShareItems] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -130,7 +127,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -146,7 +142,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -293,7 +288,7 @@ async def create(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.FileShare
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -331,7 +326,6 @@ async def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -345,11 +339,7 @@ async def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("FileShare", pipeline_response)
-
-        if response.status_code == 201:
-            deserialized = self._deserialize("FileShare", pipeline_response)
+        deserialized = self._deserialize("FileShare", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -459,7 +449,7 @@ async def update(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.FileShare
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -496,7 +486,6 @@ async def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -510,7 +499,7 @@ async def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileShare", pipeline_response)
+        deserialized = self._deserialize("FileShare", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -551,7 +540,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.FileShare
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -578,7 +567,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -592,7 +580,7 @@ async def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileShare", pipeline_response)
+        deserialized = self._deserialize("FileShare", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -600,7 +588,7 @@ async def get(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
+    async def delete(
         self,
         resource_group_name: str,
         account_name: str,
@@ -628,7 +616,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,
@@ -654,7 +642,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -672,7 +659,7 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             return cls(pipeline_response, None, {})  # type: ignore
 
     @overload
-    async def restore(  # pylint: disable=inconsistent-return-statements
+    async def restore(
         self,
         resource_group_name: str,
         account_name: str,
@@ -707,7 +694,7 @@ async def restore(  # pylint: disable=inconsistent-return-statements
         """
 
     @overload
-    async def restore(  # pylint: disable=inconsistent-return-statements
+    async def restore(
         self,
         resource_group_name: str,
         account_name: str,
@@ -742,7 +729,7 @@ async def restore(  # pylint: disable=inconsistent-return-statements
         """
 
     @distributed_trace_async
-    async def restore(  # pylint: disable=inconsistent-return-statements
+    async def restore(
         self,
         resource_group_name: str,
         account_name: str,
@@ -770,7 +757,7 @@ async def restore(  # 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,
@@ -807,7 +794,6 @@ async def restore(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/operations/_management_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/operations/_management_policies_operations.py
index 4ac109494771..8ca1c76327b0 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/operations/_management_policies_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/operations/_management_policies_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,
@@ -19,14 +18,12 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._management_policies_operations import (
     build_create_or_update_request,
     build_delete_request,
@@ -36,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]]
 
@@ -86,7 +83,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.ManagementPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -111,7 +108,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -125,7 +121,7 @@ async def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ManagementPolicy", pipeline_response)
+        deserialized = self._deserialize("ManagementPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -229,7 +225,7 @@ async def create_or_update(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.ManagementPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -266,7 +262,6 @@ async def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -280,7 +275,7 @@ async def create_or_update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ManagementPolicy", pipeline_response)
+        deserialized = self._deserialize("ManagementPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -288,7 +283,7 @@ async def create_or_update(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
+    async def delete(
         self,
         resource_group_name: str,
         account_name: str,
@@ -312,7 +307,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,
@@ -337,7 +332,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/operations/_object_replication_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/operations/_object_replication_policies_operations.py
index 79a71a5f1b54..659696763903 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/operations/_object_replication_policies_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/operations/_object_replication_policies_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._object_replication_policies_operations import (
     build_create_or_update_request,
     build_delete_request,
@@ -40,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]]
 
@@ -92,7 +89,7 @@ def list(
         )
         cls: ClsType[_models.ObjectReplicationPolicies] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -111,7 +108,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -127,7 +123,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -177,7 +172,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.ObjectReplicationPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -202,7 +197,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -217,7 +211,7 @@ async def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response)
+        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -322,7 +316,7 @@ async def create_or_update(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.ObjectReplicationPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -359,7 +353,6 @@ async def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -374,7 +367,7 @@ async def create_or_update(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response)
+        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -382,7 +375,7 @@ async def create_or_update(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
+    async def delete(
         self, resource_group_name: str, account_name: str, object_replication_policy_id: str, **kwargs: Any
     ) -> None:
         """Deletes the object replication policy associated with the specified storage account.
@@ -401,7 +394,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,
@@ -426,7 +419,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/operations/_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/operations/_operations.py
index 4835404a9ab8..41d32f5e8c79 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/operations/_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/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
@@ -20,20 +19,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._operations import build_list_request
 
 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 +72,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.Operation"]:
         )
         cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -91,7 +88,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -107,7 +103,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/operations/_private_endpoint_connections_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/operations/_private_endpoint_connections_operations.py
index 58c3267e41bc..7149a6210d6e 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/operations/_private_endpoint_connections_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/operations/_private_endpoint_connections_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._private_endpoint_connections_operations import (
     build_delete_request,
     build_get_request,
@@ -40,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]]
 
@@ -69,6 +66,7 @@ def __init__(self, *args, **kwargs) -> None:
     def list(
         self, resource_group_name: str, account_name: str, **kwargs: Any
     ) -> AsyncIterable["_models.PrivateEndpointConnection"]:
+        # pylint: disable=line-too-long
         """List all the private endpoint connections associated with the storage account.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -92,7 +90,7 @@ def list(
         )
         cls: ClsType[_models.PrivateEndpointConnectionListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -111,7 +109,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -127,7 +124,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -176,7 +172,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.PrivateEndpointConnection
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -201,7 +197,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -216,7 +211,7 @@ async def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response)
+        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -318,7 +313,7 @@ async def put(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.PrivateEndpointConnection
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -355,7 +350,6 @@ async def put(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -370,7 +364,7 @@ async def put(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response)
+        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -378,7 +372,7 @@ async def put(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
+    async def delete(
         self, resource_group_name: str, account_name: str, private_endpoint_connection_name: str, **kwargs: Any
     ) -> None:
         """Deletes the specified private endpoint connection associated with the storage account.
@@ -397,7 +391,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,
@@ -422,7 +416,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/operations/_private_link_resources_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/operations/_private_link_resources_operations.py
index 73610cec0dcb..985aee1569e9 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/operations/_private_link_resources_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/operations/_private_link_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, Optional, Type, TypeVar
+from typing import Any, Callable, Dict, Optional, TypeVar
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -18,20 +17,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._private_link_resources_operations import build_list_by_storage_account_request
 
 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]]
 
@@ -73,7 +70,7 @@ async def list_by_storage_account(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.PrivateLinkResourceListResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -97,7 +94,6 @@ async def list_by_storage_account(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -111,7 +107,7 @@ async def list_by_storage_account(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("PrivateLinkResourceListResult", pipeline_response)
+        deserialized = self._deserialize("PrivateLinkResourceListResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/operations/_queue_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/operations/_queue_operations.py
index 05788b2ca6dc..c8551e56695d 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/operations/_queue_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/operations/_queue_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._queue_operations import (
     build_create_request,
     build_delete_request,
@@ -41,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]]
 
@@ -166,7 +163,7 @@ async def create(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.StorageQueue
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -203,7 +200,6 @@ async def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -217,7 +213,7 @@ async def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageQueue", pipeline_response)
+        deserialized = self._deserialize("StorageQueue", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -324,7 +320,7 @@ async def update(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.StorageQueue
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -361,7 +357,6 @@ async def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -375,7 +370,7 @@ async def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageQueue", pipeline_response)
+        deserialized = self._deserialize("StorageQueue", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -404,7 +399,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.StorageQueue
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -429,7 +424,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -443,7 +437,7 @@ async def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageQueue", pipeline_response)
+        deserialized = self._deserialize("StorageQueue", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -451,9 +445,7 @@ async def get(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, queue_name: str, **kwargs: Any
-    ) -> None:
+    async def delete(self, resource_group_name: str, account_name: str, queue_name: str, **kwargs: Any) -> None:
         """Deletes the queue with the specified queue name, under the specified account if it exists.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -472,7 +464,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,
@@ -497,7 +489,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -551,7 +542,7 @@ def list(
         )
         cls: ClsType[_models.ListQueueResource] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -572,7 +563,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -588,7 +578,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/operations/_queue_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/operations/_queue_services_operations.py
index 6d01f35b496e..71f33fb1e79a 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/operations/_queue_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/operations/_queue_services_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,
@@ -19,14 +18,12 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._queue_services_operations import (
     build_get_service_properties_request,
     build_list_request,
@@ -36,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]]
 
@@ -76,7 +73,7 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.ListQueueServices
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -100,7 +97,6 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -114,7 +110,7 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListQueueServices", pipeline_response)
+        deserialized = self._deserialize("ListQueueServices", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -222,7 +218,7 @@ async def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.QueueServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -259,7 +255,6 @@ async def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -273,7 +268,7 @@ async def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("QueueServiceProperties", pipeline_response)
+        deserialized = self._deserialize("QueueServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -301,7 +296,7 @@ async def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.QueueServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -326,7 +321,6 @@ async def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -340,7 +334,7 @@ async def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("QueueServiceProperties", pipeline_response)
+        deserialized = self._deserialize("QueueServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/operations/_skus_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/operations/_skus_operations.py
index b3bb656f8255..e3b90660bd89 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/operations/_skus_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/operations/_skus_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
@@ -20,20 +19,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._skus_operations import build_list_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
 
@@ -75,7 +72,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.SkuInformation"]:
         )
         cls: ClsType[_models.StorageSkuListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -92,7 +89,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -108,7 +104,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/operations/_storage_accounts_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/operations/_storage_accounts_operations.py
index 363b88ab9e6c..8557245fcc20 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/operations/_storage_accounts_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/operations/_storage_accounts_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,20 @@
 # --------------------------------------------------------------------------
 from io import IOBase
 import sys
-from typing import Any, AsyncIterable, Callable, Dict, IO, Literal, Optional, Type, TypeVar, Union, cast, overload
+from typing import (
+    Any,
+    AsyncIterable,
+    AsyncIterator,
+    Callable,
+    Dict,
+    IO,
+    Literal,
+    Optional,
+    TypeVar,
+    Union,
+    cast,
+    overload,
+)
 import urllib.parse
 
 from azure.core.async_paging import AsyncItemPaged, AsyncList
@@ -18,12 +31,13 @@
     ResourceExistsError,
     ResourceNotFoundError,
     ResourceNotModifiedError,
+    StreamClosedError,
+    StreamConsumedError,
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
 from azure.core.polling import AsyncLROPoller, AsyncNoPolling, AsyncPollingMethod
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
@@ -31,7 +45,6 @@
 from azure.mgmt.core.polling.async_arm_polling import AsyncARMPolling
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._storage_accounts_operations import (
     build_check_name_availability_request,
     build_create_request,
@@ -52,7 +65,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]]
 
@@ -135,7 +148,7 @@ async def check_name_availability(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.CheckNameAvailabilityResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -169,7 +182,6 @@ async def check_name_availability(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -183,7 +195,7 @@ async def check_name_availability(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response)
+        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -196,8 +208,8 @@ async def _create_initial(
         account_name: str,
         parameters: Union[_models.StorageAccountCreateParameters, IO[bytes]],
         **kwargs: Any
-    ) -> Optional[_models.StorageAccount]:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -212,7 +224,7 @@ async def _create_initial(
             "api_version", _params.pop("api-version", self._api_version or "2020-08-01-preview")
         )
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
-        cls: ClsType[Optional[_models.StorageAccount]] = kwargs.pop("cls", None)
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
         _json = None
@@ -233,10 +245,10 @@ async def _create_initial(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -244,12 +256,14 @@ async def _create_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = None
-        if response.status_code == 200:
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -377,10 +391,11 @@ async def begin_create(
                 params=_params,
                 **kwargs
             )
+            await raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+            deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
             if cls:
                 return cls(pipeline_response, deserialized, {})  # type: ignore
             return deserialized
@@ -403,9 +418,7 @@ def get_long_running_output(pipeline_response):
         )
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, **kwargs: Any
-    ) -> None:
+    async def delete(self, resource_group_name: str, account_name: str, **kwargs: Any) -> None:
         """Deletes a storage account in Microsoft Azure.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -419,7 +432,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,
@@ -443,7 +456,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -488,7 +500,7 @@ async def get_properties(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -513,7 +525,6 @@ async def get_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -527,7 +538,7 @@ async def get_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -638,7 +649,7 @@ async def update(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -674,7 +685,6 @@ async def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -688,7 +698,7 @@ async def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -713,7 +723,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.StorageAccount"]:
         )
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -730,7 +740,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -746,7 +755,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -798,7 +806,7 @@ def list_by_resource_group(
         )
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -816,7 +824,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -832,7 +839,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -882,7 +888,7 @@ async def list_keys(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.StorageAccountListKeysResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -907,7 +913,6 @@ async def list_keys(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -921,7 +926,7 @@ async def list_keys(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response)
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1016,7 +1021,7 @@ async def regenerate_key(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.StorageAccountListKeysResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1052,7 +1057,6 @@ async def regenerate_key(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1066,7 +1070,7 @@ async def regenerate_key(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response)
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1158,7 +1162,7 @@ async def list_account_sas(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.ListAccountSasResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1194,7 +1198,6 @@ async def list_account_sas(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1208,7 +1211,7 @@ async def list_account_sas(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListAccountSasResponse", pipeline_response)
+        deserialized = self._deserialize("ListAccountSasResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1298,7 +1301,7 @@ async def list_service_sas(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.ListServiceSasResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1334,7 +1337,6 @@ async def list_service_sas(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1348,17 +1350,17 @@ async def list_service_sas(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListServiceSasResponse", pipeline_response)
+        deserialized = self._deserialize("ListServiceSasResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
 
         return deserialized  # type: ignore
 
-    async def _failover_initial(  # pylint: disable=inconsistent-return-statements
+    async def _failover_initial(
         self, resource_group_name: str, account_name: str, **kwargs: Any
-    ) -> None:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1372,7 +1374,7 @@ async def _failover_initial(  # pylint: disable=inconsistent-return-statements
         api_version: str = kwargs.pop(
             "api_version", _params.pop("api-version", self._api_version or "2020-08-01-preview")
         )
-        cls: ClsType[None] = kwargs.pop("cls", None)
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
 
         _request = build_failover_request(
             resource_group_name=resource_group_name,
@@ -1382,10 +1384,10 @@ async def _failover_initial(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -1393,11 +1395,19 @@ async def _failover_initial(  # pylint: disable=inconsistent-return-statements
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
-            return cls(pipeline_response, None, {})  # type: ignore
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
 
     @distributed_trace_async
     async def begin_failover(self, resource_group_name: str, account_name: str, **kwargs: Any) -> AsyncLROPoller[None]:
@@ -1427,7 +1437,7 @@ async def begin_failover(self, resource_group_name: str, account_name: str, **kw
         lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
         cont_token: Optional[str] = kwargs.pop("continuation_token", None)
         if cont_token is None:
-            raw_result = await self._failover_initial(  # type: ignore
+            raw_result = await self._failover_initial(
                 resource_group_name=resource_group_name,
                 account_name=account_name,
                 api_version=api_version,
@@ -1436,6 +1446,7 @@ async def begin_failover(self, resource_group_name: str, account_name: str, **kw
                 params=_params,
                 **kwargs
             )
+            await raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
@@ -1465,8 +1476,8 @@ async def _restore_blob_ranges_initial(
         account_name: str,
         parameters: Union[_models.BlobRestoreParameters, IO[bytes]],
         **kwargs: Any
-    ) -> _models.BlobRestoreStatus:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1481,7 +1492,7 @@ async def _restore_blob_ranges_initial(
             "api_version", _params.pop("api-version", self._api_version or "2020-08-01-preview")
         )
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
-        cls: ClsType[_models.BlobRestoreStatus] = kwargs.pop("cls", None)
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
         _json = None
@@ -1502,10 +1513,10 @@ async def _restore_blob_ranges_initial(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -1513,14 +1524,14 @@ async def _restore_blob_ranges_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response)
-
-        if response.status_code == 202:
-            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response)
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1639,10 +1650,11 @@ async def begin_restore_blob_ranges(
                 params=_params,
                 **kwargs
             )
+            await raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):
-            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response)
+            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response.http_response)
             if cls:
                 return cls(pipeline_response, deserialized, {})  # type: ignore
             return deserialized
@@ -1667,9 +1679,7 @@ def get_long_running_output(pipeline_response):
         )
 
     @distributed_trace_async
-    async def revoke_user_delegation_keys(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, **kwargs: Any
-    ) -> None:
+    async def revoke_user_delegation_keys(self, resource_group_name: str, account_name: str, **kwargs: Any) -> None:
         """Revoke user delegation keys.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -1683,7 +1693,7 @@ async def revoke_user_delegation_keys(  # pylint: disable=inconsistent-return-st
         :rtype: None
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1707,7 +1717,6 @@ async def revoke_user_delegation_keys(  # pylint: disable=inconsistent-return-st
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/operations/_table_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/operations/_table_operations.py
index 443e4d78b252..b9b38067c495 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/operations/_table_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/operations/_table_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
@@ -20,15 +19,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._table_operations import (
     build_create_request,
     build_delete_request,
@@ -40,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]]
 
@@ -86,7 +83,7 @@ async def create(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.Table
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -111,7 +108,6 @@ async def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -125,7 +121,7 @@ async def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("Table", pipeline_response)
+        deserialized = self._deserialize("Table", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -153,7 +149,7 @@ async def update(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.Table
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -178,7 +174,6 @@ async def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -192,7 +187,7 @@ async def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("Table", pipeline_response)
+        deserialized = self._deserialize("Table", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -218,7 +213,7 @@ async def get(self, resource_group_name: str, account_name: str, table_name: str
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.Table
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -243,7 +238,6 @@ async def get(self, resource_group_name: str, account_name: str, table_name: str
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -257,7 +251,7 @@ async def get(self, resource_group_name: str, account_name: str, table_name: str
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("Table", pipeline_response)
+        deserialized = self._deserialize("Table", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -265,9 +259,7 @@ async def get(self, resource_group_name: str, account_name: str, table_name: str
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, table_name: str, **kwargs: Any
-    ) -> None:
+    async def delete(self, resource_group_name: str, account_name: str, table_name: str, **kwargs: Any) -> None:
         """Deletes the table with the specified table name, under the specified account if it exists.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -285,7 +277,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,
@@ -310,7 +302,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -351,7 +342,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> As
         )
         cls: ClsType[_models.ListTableResource] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -370,7 +361,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -386,7 +376,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/operations/_table_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/operations/_table_services_operations.py
index a45a3c823c00..af1d2156eb72 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/operations/_table_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/operations/_table_services_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,
@@ -19,14 +18,12 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._table_services_operations import (
     build_get_service_properties_request,
     build_list_request,
@@ -36,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]]
 
@@ -76,7 +73,7 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.ListTableServices
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -100,7 +97,6 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -114,7 +110,7 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListTableServices", pipeline_response)
+        deserialized = self._deserialize("ListTableServices", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -222,7 +218,7 @@ async def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.TableServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -259,7 +255,6 @@ async def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -273,7 +268,7 @@ async def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("TableServiceProperties", pipeline_response)
+        deserialized = self._deserialize("TableServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -301,7 +296,7 @@ async def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.TableServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -326,7 +321,6 @@ async def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -340,7 +334,7 @@ async def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("TableServiceProperties", pipeline_response)
+        deserialized = self._deserialize("TableServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/operations/_usages_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/operations/_usages_operations.py
index ffc4af115fde..7bba46c4c5e2 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/operations/_usages_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/aio/operations/_usages_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
@@ -20,20 +19,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._usages_operations import build_list_by_location_request
 
 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 +75,7 @@ def list_by_location(self, location: str, **kwargs: Any) -> AsyncIterable["_mode
         )
         cls: ClsType[_models.UsageListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -96,7 +93,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -112,7 +108,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/models/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/models/__init__.py
index 9e18bee7a8b2..f72ebbf8936f 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/models/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/models/__init__.py
@@ -5,188 +5,199 @@
 # 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 AccountSasParameters
-from ._models_py3 import ActiveDirectoryProperties
-from ._models_py3 import AzureEntityResource
-from ._models_py3 import AzureFilesIdentityBasedAuthentication
-from ._models_py3 import BlobContainer
-from ._models_py3 import BlobInventoryPolicy
-from ._models_py3 import BlobInventoryPolicyDefinition
-from ._models_py3 import BlobInventoryPolicyFilter
-from ._models_py3 import BlobInventoryPolicyRule
-from ._models_py3 import BlobInventoryPolicySchema
-from ._models_py3 import BlobRestoreParameters
-from ._models_py3 import BlobRestoreRange
-from ._models_py3 import BlobRestoreStatus
-from ._models_py3 import BlobServiceItems
-from ._models_py3 import BlobServiceProperties
-from ._models_py3 import ChangeFeed
-from ._models_py3 import CheckNameAvailabilityResult
-from ._models_py3 import CloudErrorBody
-from ._models_py3 import CorsRule
-from ._models_py3 import CorsRules
-from ._models_py3 import CustomDomain
-from ._models_py3 import DateAfterCreation
-from ._models_py3 import DateAfterModification
-from ._models_py3 import DeleteRetentionPolicy
-from ._models_py3 import DeletedAccount
-from ._models_py3 import DeletedAccountListResult
-from ._models_py3 import DeletedShare
-from ._models_py3 import Dimension
-from ._models_py3 import Encryption
-from ._models_py3 import EncryptionScope
-from ._models_py3 import EncryptionScopeKeyVaultProperties
-from ._models_py3 import EncryptionScopeListResult
-from ._models_py3 import EncryptionService
-from ._models_py3 import EncryptionServices
-from ._models_py3 import Endpoints
-from ._models_py3 import ErrorResponse
-from ._models_py3 import ErrorResponseBody
-from ._models_py3 import ExtendedLocation
-from ._models_py3 import FileServiceItems
-from ._models_py3 import FileServiceProperties
-from ._models_py3 import FileShare
-from ._models_py3 import FileShareItem
-from ._models_py3 import FileShareItems
-from ._models_py3 import GeoReplicationStats
-from ._models_py3 import IPRule
-from ._models_py3 import Identity
-from ._models_py3 import ImmutabilityPolicy
-from ._models_py3 import ImmutabilityPolicyProperties
-from ._models_py3 import KeyVaultProperties
-from ._models_py3 import LastAccessTimeTrackingPolicy
-from ._models_py3 import LeaseContainerRequest
-from ._models_py3 import LeaseContainerResponse
-from ._models_py3 import LegalHold
-from ._models_py3 import LegalHoldProperties
-from ._models_py3 import ListAccountSasResponse
-from ._models_py3 import ListBlobInventoryPolicy
-from ._models_py3 import ListContainerItem
-from ._models_py3 import ListContainerItems
-from ._models_py3 import ListQueue
-from ._models_py3 import ListQueueResource
-from ._models_py3 import ListQueueServices
-from ._models_py3 import ListServiceSasResponse
-from ._models_py3 import ListTableResource
-from ._models_py3 import ListTableServices
-from ._models_py3 import ManagementPolicy
-from ._models_py3 import ManagementPolicyAction
-from ._models_py3 import ManagementPolicyBaseBlob
-from ._models_py3 import ManagementPolicyDefinition
-from ._models_py3 import ManagementPolicyFilter
-from ._models_py3 import ManagementPolicyRule
-from ._models_py3 import ManagementPolicySchema
-from ._models_py3 import ManagementPolicySnapShot
-from ._models_py3 import ManagementPolicyVersion
-from ._models_py3 import MetricSpecification
-from ._models_py3 import Multichannel
-from ._models_py3 import NetworkRuleSet
-from ._models_py3 import ObjectReplicationPolicies
-from ._models_py3 import ObjectReplicationPolicy
-from ._models_py3 import ObjectReplicationPolicyFilter
-from ._models_py3 import ObjectReplicationPolicyRule
-from ._models_py3 import Operation
-from ._models_py3 import OperationDisplay
-from ._models_py3 import OperationListResult
-from ._models_py3 import PrivateEndpoint
-from ._models_py3 import PrivateEndpointConnection
-from ._models_py3 import PrivateEndpointConnectionListResult
-from ._models_py3 import PrivateLinkResource
-from ._models_py3 import PrivateLinkResourceListResult
-from ._models_py3 import PrivateLinkServiceConnectionState
-from ._models_py3 import ProtocolSettings
-from ._models_py3 import ProxyResource
-from ._models_py3 import QueueServiceProperties
-from ._models_py3 import Resource
-from ._models_py3 import ResourceAccessRule
-from ._models_py3 import RestorePolicyProperties
-from ._models_py3 import Restriction
-from ._models_py3 import RoutingPreference
-from ._models_py3 import SKUCapability
-from ._models_py3 import ServiceSasParameters
-from ._models_py3 import ServiceSpecification
-from ._models_py3 import Sku
-from ._models_py3 import SkuInformation
-from ._models_py3 import SmbSetting
-from ._models_py3 import StorageAccount
-from ._models_py3 import StorageAccountCheckNameAvailabilityParameters
-from ._models_py3 import StorageAccountCreateParameters
-from ._models_py3 import StorageAccountInternetEndpoints
-from ._models_py3 import StorageAccountKey
-from ._models_py3 import StorageAccountListKeysResult
-from ._models_py3 import StorageAccountListResult
-from ._models_py3 import StorageAccountMicrosoftEndpoints
-from ._models_py3 import StorageAccountRegenerateKeyParameters
-from ._models_py3 import StorageAccountUpdateParameters
-from ._models_py3 import StorageQueue
-from ._models_py3 import StorageSkuListResult
-from ._models_py3 import SystemData
-from ._models_py3 import Table
-from ._models_py3 import TableServiceProperties
-from ._models_py3 import TagFilter
-from ._models_py3 import TagProperty
-from ._models_py3 import TrackedResource
-from ._models_py3 import UpdateHistoryProperty
-from ._models_py3 import Usage
-from ._models_py3 import UsageListResult
-from ._models_py3 import UsageName
-from ._models_py3 import VirtualNetworkRule
+from typing import TYPE_CHECKING
 
-from ._storage_management_client_enums import AccessTier
-from ._storage_management_client_enums import AccountStatus
-from ._storage_management_client_enums import BlobInventoryPolicyName
-from ._storage_management_client_enums import BlobRestoreProgressStatus
-from ._storage_management_client_enums import Bypass
-from ._storage_management_client_enums import CorsRuleAllowedMethodsItem
-from ._storage_management_client_enums import CreatedByType
-from ._storage_management_client_enums import DefaultAction
-from ._storage_management_client_enums import DirectoryServiceOptions
-from ._storage_management_client_enums import EnabledProtocols
-from ._storage_management_client_enums import EncryptionScopeSource
-from ._storage_management_client_enums import EncryptionScopeState
-from ._storage_management_client_enums import Enum28
-from ._storage_management_client_enums import ExtendedLocationTypes
-from ._storage_management_client_enums import GeoReplicationStatus
-from ._storage_management_client_enums import HttpProtocol
-from ._storage_management_client_enums import ImmutabilityPolicyState
-from ._storage_management_client_enums import ImmutabilityPolicyUpdateType
-from ._storage_management_client_enums import InventoryRuleType
-from ._storage_management_client_enums import KeyPermission
-from ._storage_management_client_enums import KeySource
-from ._storage_management_client_enums import KeyType
-from ._storage_management_client_enums import Kind
-from ._storage_management_client_enums import LargeFileSharesState
-from ._storage_management_client_enums import LeaseContainerRequestAction
-from ._storage_management_client_enums import LeaseDuration
-from ._storage_management_client_enums import LeaseState
-from ._storage_management_client_enums import LeaseStatus
-from ._storage_management_client_enums import ListContainersInclude
-from ._storage_management_client_enums import ListSharesExpand
-from ._storage_management_client_enums import ManagementPolicyName
-from ._storage_management_client_enums import MinimumTlsVersion
-from ._storage_management_client_enums import Name
-from ._storage_management_client_enums import Permissions
-from ._storage_management_client_enums import PrivateEndpointConnectionProvisioningState
-from ._storage_management_client_enums import PrivateEndpointServiceConnectionStatus
-from ._storage_management_client_enums import ProvisioningState
-from ._storage_management_client_enums import PublicAccess
-from ._storage_management_client_enums import Reason
-from ._storage_management_client_enums import ReasonCode
-from ._storage_management_client_enums import RootSquashType
-from ._storage_management_client_enums import RoutingChoice
-from ._storage_management_client_enums import RuleType
-from ._storage_management_client_enums import Services
-from ._storage_management_client_enums import ShareAccessTier
-from ._storage_management_client_enums import SignedResource
-from ._storage_management_client_enums import SignedResourceTypes
-from ._storage_management_client_enums import SkuName
-from ._storage_management_client_enums import SkuTier
-from ._storage_management_client_enums import State
-from ._storage_management_client_enums import StorageAccountExpand
-from ._storage_management_client_enums import UsageUnit
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+
+from ._models_py3 import (  # type: ignore
+    AccountSasParameters,
+    ActiveDirectoryProperties,
+    AzureEntityResource,
+    AzureFilesIdentityBasedAuthentication,
+    BlobContainer,
+    BlobInventoryPolicy,
+    BlobInventoryPolicyDefinition,
+    BlobInventoryPolicyFilter,
+    BlobInventoryPolicyRule,
+    BlobInventoryPolicySchema,
+    BlobRestoreParameters,
+    BlobRestoreRange,
+    BlobRestoreStatus,
+    BlobServiceItems,
+    BlobServiceProperties,
+    ChangeFeed,
+    CheckNameAvailabilityResult,
+    CloudErrorBody,
+    CorsRule,
+    CorsRules,
+    CustomDomain,
+    DateAfterCreation,
+    DateAfterModification,
+    DeleteRetentionPolicy,
+    DeletedAccount,
+    DeletedAccountListResult,
+    DeletedShare,
+    Dimension,
+    Encryption,
+    EncryptionScope,
+    EncryptionScopeKeyVaultProperties,
+    EncryptionScopeListResult,
+    EncryptionService,
+    EncryptionServices,
+    Endpoints,
+    ErrorResponse,
+    ErrorResponseBody,
+    ExtendedLocation,
+    FileServiceItems,
+    FileServiceProperties,
+    FileShare,
+    FileShareItem,
+    FileShareItems,
+    GeoReplicationStats,
+    IPRule,
+    Identity,
+    ImmutabilityPolicy,
+    ImmutabilityPolicyProperties,
+    KeyVaultProperties,
+    LastAccessTimeTrackingPolicy,
+    LeaseContainerRequest,
+    LeaseContainerResponse,
+    LegalHold,
+    LegalHoldProperties,
+    ListAccountSasResponse,
+    ListBlobInventoryPolicy,
+    ListContainerItem,
+    ListContainerItems,
+    ListQueue,
+    ListQueueResource,
+    ListQueueServices,
+    ListServiceSasResponse,
+    ListTableResource,
+    ListTableServices,
+    ManagementPolicy,
+    ManagementPolicyAction,
+    ManagementPolicyBaseBlob,
+    ManagementPolicyDefinition,
+    ManagementPolicyFilter,
+    ManagementPolicyRule,
+    ManagementPolicySchema,
+    ManagementPolicySnapShot,
+    ManagementPolicyVersion,
+    MetricSpecification,
+    Multichannel,
+    NetworkRuleSet,
+    ObjectReplicationPolicies,
+    ObjectReplicationPolicy,
+    ObjectReplicationPolicyFilter,
+    ObjectReplicationPolicyRule,
+    Operation,
+    OperationDisplay,
+    OperationListResult,
+    PrivateEndpoint,
+    PrivateEndpointConnection,
+    PrivateEndpointConnectionListResult,
+    PrivateLinkResource,
+    PrivateLinkResourceListResult,
+    PrivateLinkServiceConnectionState,
+    ProtocolSettings,
+    ProxyResource,
+    QueueServiceProperties,
+    Resource,
+    ResourceAccessRule,
+    RestorePolicyProperties,
+    Restriction,
+    RoutingPreference,
+    SKUCapability,
+    ServiceSasParameters,
+    ServiceSpecification,
+    Sku,
+    SkuInformation,
+    SmbSetting,
+    StorageAccount,
+    StorageAccountCheckNameAvailabilityParameters,
+    StorageAccountCreateParameters,
+    StorageAccountInternetEndpoints,
+    StorageAccountKey,
+    StorageAccountListKeysResult,
+    StorageAccountListResult,
+    StorageAccountMicrosoftEndpoints,
+    StorageAccountRegenerateKeyParameters,
+    StorageAccountUpdateParameters,
+    StorageQueue,
+    StorageSkuListResult,
+    SystemData,
+    Table,
+    TableServiceProperties,
+    TagFilter,
+    TagProperty,
+    TrackedResource,
+    UpdateHistoryProperty,
+    Usage,
+    UsageListResult,
+    UsageName,
+    VirtualNetworkRule,
+)
+
+from ._storage_management_client_enums import (  # type: ignore
+    AccessTier,
+    AccountStatus,
+    BlobInventoryPolicyName,
+    BlobRestoreProgressStatus,
+    Bypass,
+    CorsRuleAllowedMethodsItem,
+    CreatedByType,
+    DefaultAction,
+    DirectoryServiceOptions,
+    EnabledProtocols,
+    EncryptionScopeSource,
+    EncryptionScopeState,
+    Enum28,
+    ExtendedLocationTypes,
+    GeoReplicationStatus,
+    HttpProtocol,
+    ImmutabilityPolicyState,
+    ImmutabilityPolicyUpdateType,
+    InventoryRuleType,
+    KeyPermission,
+    KeySource,
+    KeyType,
+    Kind,
+    LargeFileSharesState,
+    LeaseContainerRequestAction,
+    LeaseDuration,
+    LeaseState,
+    LeaseStatus,
+    ListContainersInclude,
+    ListSharesExpand,
+    ManagementPolicyName,
+    MinimumTlsVersion,
+    Name,
+    Permissions,
+    PrivateEndpointConnectionProvisioningState,
+    PrivateEndpointServiceConnectionStatus,
+    ProvisioningState,
+    PublicAccess,
+    Reason,
+    ReasonCode,
+    RootSquashType,
+    RoutingChoice,
+    RuleType,
+    Services,
+    ShareAccessTier,
+    SignedResource,
+    SignedResourceTypes,
+    SkuName,
+    SkuTier,
+    State,
+    StorageAccountExpand,
+    UsageUnit,
+)
 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__ = [
@@ -369,5 +380,5 @@
     "StorageAccountExpand",
     "UsageUnit",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/models/_models_py3.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/models/_models_py3.py
index acc1698eb30c..4009528a4dfc 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/models/_models_py3.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/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
 
 
@@ -311,7 +310,7 @@ def __init__(
         self.active_directory_properties = active_directory_properties
 
 
-class BlobContainer(AzureEntityResource):  # pylint: disable=too-many-instance-attributes
+class BlobContainer(AzureEntityResource):
     """Properties of the blob container, including Id, resource name, resource type, Etag.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -824,7 +823,7 @@ def __init__(self, **kwargs: Any) -> None:
         self.value = None
 
 
-class BlobServiceProperties(Resource):  # pylint: disable=too-many-instance-attributes
+class BlobServiceProperties(Resource):
     """The properties of a storage account’s Blob service.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -2018,7 +2017,7 @@ def __init__(
         self.protocol_settings = protocol_settings
 
 
-class FileShare(AzureEntityResource):  # pylint: disable=too-many-instance-attributes
+class FileShare(AzureEntityResource):
     """Properties of the file share, including Id, resource name, resource type, Etag.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -2154,7 +2153,7 @@ def __init__(
         self.snapshot_time = None
 
 
-class FileShareItem(AzureEntityResource):  # pylint: disable=too-many-instance-attributes
+class FileShareItem(AzureEntityResource):
     """The file share properties be listed out.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -2695,7 +2694,7 @@ class LeaseContainerRequest(_serialization.Model):
     All required parameters must be populated in order to send to server.
 
     :ivar action: Specifies the lease action. Can be one of the available actions. Required. Known
-     values are: "Acquire", "Renew", "Change", "Release", and "Break".
+     values are: "Acquire", "Renew", "Change", "Release", "Break", and "Break".
     :vartype action: str or
      ~azure.mgmt.storage.v2020_08_01_preview.models.LeaseContainerRequestAction
     :ivar lease_id: Identifies the lease. Can be specified in any valid GUID string format.
@@ -2735,7 +2734,7 @@ def __init__(
     ) -> None:
         """
         :keyword action: Specifies the lease action. Can be one of the available actions. Required.
-         Known values are: "Acquire", "Renew", "Change", "Release", and "Break".
+         Known values are: "Acquire", "Renew", "Change", "Release", "Break", and "Break".
         :paramtype action: str or
          ~azure.mgmt.storage.v2020_08_01_preview.models.LeaseContainerRequestAction
         :keyword lease_id: Identifies the lease. Can be specified in any valid GUID string format.
@@ -2905,7 +2904,7 @@ def __init__(self, **kwargs: Any) -> None:
         self.value = None
 
 
-class ListContainerItem(AzureEntityResource):  # pylint: disable=too-many-instance-attributes
+class ListContainerItem(AzureEntityResource):
     """The blob container properties be listed out.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -4561,7 +4560,7 @@ def __init__(
         self.publish_internet_endpoints = publish_internet_endpoints
 
 
-class ServiceSasParameters(_serialization.Model):  # pylint: disable=too-many-instance-attributes
+class ServiceSasParameters(_serialization.Model):
     """The parameters to list service SAS credentials of a specific resource.
 
     All required parameters must be populated in order to send to server.
@@ -4966,7 +4965,7 @@ def __init__(self, *, location: str, tags: Optional[Dict[str, str]] = None, **kw
         self.location = location
 
 
-class StorageAccount(TrackedResource):  # pylint: disable=too-many-instance-attributes
+class StorageAccount(TrackedResource):
     """The storage account.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -5270,7 +5269,7 @@ def __init__(self, *, name: str, **kwargs: Any) -> None:
         self.name = name
 
 
-class StorageAccountCreateParameters(_serialization.Model):  # pylint: disable=too-many-instance-attributes
+class StorageAccountCreateParameters(_serialization.Model):
     """The parameters used when creating a storage account.
 
     All required parameters must be populated in order to send to server.
@@ -5680,7 +5679,7 @@ def __init__(self, *, key_name: str, **kwargs: Any) -> None:
         self.key_name = key_name
 
 
-class StorageAccountUpdateParameters(_serialization.Model):  # pylint: disable=too-many-instance-attributes
+class StorageAccountUpdateParameters(_serialization.Model):
     """The parameters that can be provided when updating the storage account properties.
 
     :ivar sku: Gets or sets the SKU name. Note that the SKU name cannot be updated to Standard_ZRS,
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/models/_storage_management_client_enums.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/models/_storage_management_client_enums.py
index f688469021e7..a82ef09b3b72 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/models/_storage_management_client_enums.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/models/_storage_management_client_enums.py
@@ -221,6 +221,7 @@ class LeaseContainerRequestAction(str, Enum, metaclass=CaseInsensitiveEnumMeta):
     RENEW = "Renew"
     CHANGE = "Change"
     RELEASE = "Release"
+    BREAK = "Break"
     BREAK_ENUM = "Break"
 
 
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/operations/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/operations/__init__.py
index 0f201012e160..d406c5bf4d6b 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/operations/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/operations/__init__.py
@@ -5,29 +5,35 @@
 # 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 ._skus_operations import SkusOperations
-from ._storage_accounts_operations import StorageAccountsOperations
-from ._deleted_accounts_operations import DeletedAccountsOperations
-from ._usages_operations import UsagesOperations
-from ._management_policies_operations import ManagementPoliciesOperations
-from ._blob_inventory_policies_operations import BlobInventoryPoliciesOperations
-from ._private_endpoint_connections_operations import PrivateEndpointConnectionsOperations
-from ._private_link_resources_operations import PrivateLinkResourcesOperations
-from ._object_replication_policies_operations import ObjectReplicationPoliciesOperations
-from ._encryption_scopes_operations import EncryptionScopesOperations
-from ._blob_services_operations import BlobServicesOperations
-from ._blob_containers_operations import BlobContainersOperations
-from ._file_services_operations import FileServicesOperations
-from ._file_shares_operations import FileSharesOperations
-from ._queue_services_operations import QueueServicesOperations
-from ._queue_operations import QueueOperations
-from ._table_services_operations import TableServicesOperations
-from ._table_operations import TableOperations
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._operations import Operations  # type: ignore
+from ._skus_operations import SkusOperations  # type: ignore
+from ._storage_accounts_operations import StorageAccountsOperations  # type: ignore
+from ._deleted_accounts_operations import DeletedAccountsOperations  # type: ignore
+from ._usages_operations import UsagesOperations  # type: ignore
+from ._management_policies_operations import ManagementPoliciesOperations  # type: ignore
+from ._blob_inventory_policies_operations import BlobInventoryPoliciesOperations  # type: ignore
+from ._private_endpoint_connections_operations import PrivateEndpointConnectionsOperations  # type: ignore
+from ._private_link_resources_operations import PrivateLinkResourcesOperations  # type: ignore
+from ._object_replication_policies_operations import ObjectReplicationPoliciesOperations  # type: ignore
+from ._encryption_scopes_operations import EncryptionScopesOperations  # type: ignore
+from ._blob_services_operations import BlobServicesOperations  # type: ignore
+from ._blob_containers_operations import BlobContainersOperations  # type: ignore
+from ._file_services_operations import FileServicesOperations  # type: ignore
+from ._file_shares_operations import FileSharesOperations  # type: ignore
+from ._queue_services_operations import QueueServicesOperations  # type: ignore
+from ._queue_operations import QueueOperations  # type: ignore
+from ._table_services_operations import TableServicesOperations  # type: ignore
+from ._table_operations import TableOperations  # 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__ = [
@@ -51,5 +57,5 @@
     "TableServicesOperations",
     "TableOperations",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/operations/_blob_containers_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/operations/_blob_containers_operations.py
index 2c4ecd8123c4..08675aefaab3 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/operations/_blob_containers_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/operations/_blob_containers_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,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 (
@@ -21,20 +21,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -616,7 +614,7 @@ def list(
         )
         cls: ClsType[_models.ListContainerItems] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -638,7 +636,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -654,7 +651,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -789,7 +785,7 @@ def create(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -826,7 +822,6 @@ def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -840,11 +835,7 @@ def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("BlobContainer", pipeline_response)
-
-        if response.status_code == 201:
-            deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -954,7 +945,7 @@ def update(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -991,7 +982,6 @@ def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1005,7 +995,7 @@ def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1034,7 +1024,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1059,7 +1049,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1073,7 +1062,7 @@ def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1102,7 +1091,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,
@@ -1127,7 +1116,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1250,7 +1238,7 @@ def set_legal_hold(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.LegalHold
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1287,7 +1275,6 @@ def set_legal_hold(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1301,7 +1288,7 @@ def set_legal_hold(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LegalHold", pipeline_response)
+        deserialized = self._deserialize("LegalHold", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1411,7 +1398,7 @@ def clear_legal_hold(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.LegalHold
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1448,7 +1435,6 @@ def clear_legal_hold(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1462,7 +1448,7 @@ def clear_legal_hold(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LegalHold", pipeline_response)
+        deserialized = self._deserialize("LegalHold", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1602,7 +1588,7 @@ def create_or_update_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1644,7 +1630,6 @@ def create_or_update_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1661,7 +1646,7 @@ def create_or_update_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1704,7 +1689,7 @@ def get_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1731,7 +1716,6 @@ def get_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1748,7 +1732,7 @@ def get_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1793,7 +1777,7 @@ def delete_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1820,7 +1804,6 @@ def delete_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1837,7 +1820,7 @@ def delete_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1871,7 +1854,7 @@ def lock_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1897,7 +1880,6 @@ def lock_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1914,7 +1896,7 @@ def lock_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -2045,7 +2027,7 @@ def extend_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -2086,7 +2068,6 @@ def extend_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -2103,7 +2084,7 @@ def extend_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -2214,7 +2195,7 @@ def lease(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.LeaseContainerResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -2254,7 +2235,6 @@ def lease(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -2268,7 +2248,7 @@ def lease(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LeaseContainerResponse", pipeline_response)
+        deserialized = self._deserialize("LeaseContainerResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/operations/_blob_inventory_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/operations/_blob_inventory_policies_operations.py
index 053fd6adda7e..d648318a4ae2 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/operations/_blob_inventory_policies_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/operations/_blob_inventory_policies_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 (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -235,7 +232,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.BlobInventoryPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -260,7 +257,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -275,7 +271,7 @@ def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response)
+        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -380,7 +376,7 @@ def create_or_update(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.BlobInventoryPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -417,7 +413,6 @@ def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -432,7 +427,7 @@ def create_or_update(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response)
+        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -464,7 +459,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,
@@ -489,7 +484,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -533,7 +527,7 @@ def list(
         )
         cls: ClsType[_models.ListBlobInventoryPolicy] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -552,7 +546,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -568,7 +561,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/operations/_blob_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/operations/_blob_services_operations.py
index aa511729e290..bdd8b227e2ad 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/operations/_blob_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/operations/_blob_services_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 (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -199,7 +196,7 @@ def list(
         )
         cls: ClsType[_models.BlobServiceItems] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -218,7 +215,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -234,7 +230,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -364,7 +359,7 @@ def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.BlobServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -401,7 +396,6 @@ def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -415,7 +409,7 @@ def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobServiceProperties", pipeline_response)
+        deserialized = self._deserialize("BlobServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -443,7 +437,7 @@ def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.BlobServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -468,7 +462,6 @@ def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -482,7 +475,7 @@ def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobServiceProperties", pipeline_response)
+        deserialized = self._deserialize("BlobServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/operations/_deleted_accounts_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/operations/_deleted_accounts_operations.py
index 432f4d79565b..52cd3a87cba2 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/operations/_deleted_accounts_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/operations/_deleted_accounts_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 (
@@ -20,20 +19,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -133,7 +130,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.DeletedAccount"]:
         )
         cls: ClsType[_models.DeletedAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -150,7 +147,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -166,7 +162,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -208,7 +203,7 @@ def get(self, deleted_account_name: str, location: str, **kwargs: Any) -> _model
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.DeletedAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -232,7 +227,6 @@ def get(self, deleted_account_name: str, location: str, **kwargs: Any) -> _model
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -247,7 +241,7 @@ def get(self, deleted_account_name: str, location: str, **kwargs: Any) -> _model
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("DeletedAccount", pipeline_response)
+        deserialized = self._deserialize("DeletedAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/operations/_encryption_scopes_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/operations/_encryption_scopes_operations.py
index 4e05f0076ced..a86c2a50b936 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/operations/_encryption_scopes_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/operations/_encryption_scopes_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 (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -316,7 +313,7 @@ def put(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.EncryptionScope
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -353,7 +350,6 @@ def put(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -368,11 +364,7 @@ def put(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("EncryptionScope", pipeline_response)
-
-        if response.status_code == 201:
-            deserialized = self._deserialize("EncryptionScope", pipeline_response)
+        deserialized = self._deserialize("EncryptionScope", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -483,7 +475,7 @@ def patch(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.EncryptionScope
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -520,7 +512,6 @@ def patch(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -535,7 +526,7 @@ def patch(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("EncryptionScope", pipeline_response)
+        deserialized = self._deserialize("EncryptionScope", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -564,7 +555,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.EncryptionScope
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -589,7 +580,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -604,7 +594,7 @@ def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("EncryptionScope", pipeline_response)
+        deserialized = self._deserialize("EncryptionScope", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -635,7 +625,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> It
         )
         cls: ClsType[_models.EncryptionScopeListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -654,7 +644,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -670,7 +659,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/operations/_file_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/operations/_file_services_operations.py
index 11490693aa44..feac5bd72136 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/operations/_file_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/operations/_file_services_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,
@@ -19,20 +18,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -185,7 +182,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.FileServiceItems
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -209,7 +206,6 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -223,7 +219,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileServiceItems", pipeline_response)
+        deserialized = self._deserialize("FileServiceItems", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -331,7 +327,7 @@ def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.FileServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -368,7 +364,6 @@ def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -382,7 +377,7 @@ def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileServiceProperties", pipeline_response)
+        deserialized = self._deserialize("FileServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -410,7 +405,7 @@ def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.FileServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -435,7 +430,6 @@ def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -449,7 +443,7 @@ def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileServiceProperties", pipeline_response)
+        deserialized = self._deserialize("FileServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/operations/_file_shares_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/operations/_file_shares_operations.py
index 98b4e75641aa..4c28511209d9 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/operations/_file_shares_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/operations/_file_shares_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,7 @@
 # --------------------------------------------------------------------------
 from io import IOBase
 import sys
-from typing import Any, Callable, Dict, IO, Iterable, Literal, Optional, Type, TypeVar, Union, overload
+from typing import Any, Callable, Dict, IO, Iterable, Literal, Optional, TypeVar, Union, overload
 import urllib.parse
 
 from azure.core.exceptions import (
@@ -21,20 +21,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -355,7 +353,7 @@ def list(
         )
         cls: ClsType[_models.FileShareItems] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -377,7 +375,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -393,7 +390,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -540,7 +536,7 @@ def create(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.FileShare
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -578,7 +574,6 @@ def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -592,11 +587,7 @@ def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("FileShare", pipeline_response)
-
-        if response.status_code == 201:
-            deserialized = self._deserialize("FileShare", pipeline_response)
+        deserialized = self._deserialize("FileShare", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -706,7 +697,7 @@ def update(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.FileShare
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -743,7 +734,6 @@ def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -757,7 +747,7 @@ def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileShare", pipeline_response)
+        deserialized = self._deserialize("FileShare", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -798,7 +788,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.FileShare
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -825,7 +815,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -839,7 +828,7 @@ def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileShare", pipeline_response)
+        deserialized = self._deserialize("FileShare", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -875,7 +864,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,
@@ -901,7 +890,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -919,7 +907,7 @@ def delete(  # pylint: disable=inconsistent-return-statements
             return cls(pipeline_response, None, {})  # type: ignore
 
     @overload
-    def restore(  # pylint: disable=inconsistent-return-statements
+    def restore(
         self,
         resource_group_name: str,
         account_name: str,
@@ -954,7 +942,7 @@ def restore(  # pylint: disable=inconsistent-return-statements
         """
 
     @overload
-    def restore(  # pylint: disable=inconsistent-return-statements
+    def restore(
         self,
         resource_group_name: str,
         account_name: str,
@@ -1017,7 +1005,7 @@ def restore(  # 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,
@@ -1054,7 +1042,6 @@ def restore(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/operations/_management_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/operations/_management_policies_operations.py
index 6720a9832d70..b8d29c6540ca 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/operations/_management_policies_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/operations/_management_policies_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,
@@ -19,20 +18,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -196,7 +193,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.ManagementPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -221,7 +218,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -235,7 +231,7 @@ def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ManagementPolicy", pipeline_response)
+        deserialized = self._deserialize("ManagementPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -339,7 +335,7 @@ def create_or_update(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.ManagementPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -376,7 +372,6 @@ def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -390,7 +385,7 @@ def create_or_update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ManagementPolicy", pipeline_response)
+        deserialized = self._deserialize("ManagementPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -422,7 +417,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,
@@ -447,7 +442,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/operations/_object_replication_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/operations/_object_replication_policies_operations.py
index 4d707556f90d..2f4c1b482c00 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/operations/_object_replication_policies_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/operations/_object_replication_policies_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 (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -231,7 +228,7 @@ def list(
         )
         cls: ClsType[_models.ObjectReplicationPolicies] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -250,7 +247,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -266,7 +262,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -316,7 +311,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.ObjectReplicationPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -341,7 +336,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -356,7 +350,7 @@ def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response)
+        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -461,7 +455,7 @@ def create_or_update(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.ObjectReplicationPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -498,7 +492,6 @@ def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -513,7 +506,7 @@ def create_or_update(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response)
+        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -540,7 +533,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,
@@ -565,7 +558,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/operations/_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/operations/_operations.py
index 7b73a6dd1a02..028210875f5b 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/operations/_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/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 (
@@ -20,20 +19,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -96,7 +93,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.Operation"]:
         )
         cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -112,7 +109,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -128,7 +124,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/operations/_private_endpoint_connections_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/operations/_private_endpoint_connections_operations.py
index f310a52a533a..fa0054c1fbd9 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/operations/_private_endpoint_connections_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/operations/_private_endpoint_connections_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 (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -243,7 +240,7 @@ def list(
         )
         cls: ClsType[_models.PrivateEndpointConnectionListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -262,7 +259,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -278,7 +274,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -327,7 +322,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.PrivateEndpointConnection
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -352,7 +347,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -367,7 +361,7 @@ def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response)
+        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -469,7 +463,7 @@ def put(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.PrivateEndpointConnection
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -506,7 +500,6 @@ def put(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -521,7 +514,7 @@ def put(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response)
+        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -548,7 +541,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,
@@ -573,7 +566,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/operations/_private_link_resources_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/operations/_private_link_resources_operations.py
index de7e85b96b79..9c298958d11f 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/operations/_private_link_resources_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/operations/_private_link_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, Optional, Type, TypeVar
+from typing import Any, Callable, Dict, Optional, TypeVar
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -18,20 +17,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -109,7 +106,7 @@ def list_by_storage_account(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.PrivateLinkResourceListResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -133,7 +130,6 @@ def list_by_storage_account(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -147,7 +143,7 @@ def list_by_storage_account(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("PrivateLinkResourceListResult", pipeline_response)
+        deserialized = self._deserialize("PrivateLinkResourceListResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/operations/_queue_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/operations/_queue_operations.py
index baeb858ecda8..085d4db50b9b 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/operations/_queue_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/operations/_queue_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 (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -375,7 +372,7 @@ def create(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.StorageQueue
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -412,7 +409,6 @@ def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -426,7 +422,7 @@ def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageQueue", pipeline_response)
+        deserialized = self._deserialize("StorageQueue", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -533,7 +529,7 @@ def update(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.StorageQueue
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -570,7 +566,6 @@ def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -584,7 +579,7 @@ def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageQueue", pipeline_response)
+        deserialized = self._deserialize("StorageQueue", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -611,7 +606,7 @@ def get(self, resource_group_name: str, account_name: str, queue_name: str, **kw
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.StorageQueue
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -636,7 +631,6 @@ def get(self, resource_group_name: str, account_name: str, queue_name: str, **kw
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -650,7 +644,7 @@ def get(self, resource_group_name: str, account_name: str, queue_name: str, **kw
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageQueue", pipeline_response)
+        deserialized = self._deserialize("StorageQueue", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -679,7 +673,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,
@@ -704,7 +698,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -757,7 +750,7 @@ def list(
         )
         cls: ClsType[_models.ListQueueResource] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -778,7 +771,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -794,7 +786,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/operations/_queue_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/operations/_queue_services_operations.py
index 766890055fd7..b1983fa4399d 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/operations/_queue_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/operations/_queue_services_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,
@@ -19,20 +18,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -185,7 +182,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.ListQueueServices
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -209,7 +206,6 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -223,7 +219,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListQueueServices", pipeline_response)
+        deserialized = self._deserialize("ListQueueServices", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -331,7 +327,7 @@ def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.QueueServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -368,7 +364,6 @@ def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -382,7 +377,7 @@ def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("QueueServiceProperties", pipeline_response)
+        deserialized = self._deserialize("QueueServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -410,7 +405,7 @@ def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.QueueServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -435,7 +430,6 @@ def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -449,7 +443,7 @@ def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("QueueServiceProperties", pipeline_response)
+        deserialized = self._deserialize("QueueServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/operations/_skus_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/operations/_skus_operations.py
index 1f19454fe810..543967021518 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/operations/_skus_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/operations/_skus_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 (
@@ -20,20 +19,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -102,7 +99,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.SkuInformation"]:
         )
         cls: ClsType[_models.StorageSkuListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -119,7 +116,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -135,7 +131,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/operations/_storage_accounts_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/operations/_storage_accounts_operations.py
index 0f057452d61c..6349a7db870f 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/operations/_storage_accounts_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/operations/_storage_accounts_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,7 @@
 # --------------------------------------------------------------------------
 from io import IOBase
 import sys
-from typing import Any, Callable, Dict, IO, Iterable, Literal, Optional, Type, TypeVar, Union, cast, overload
+from typing import Any, Callable, Dict, IO, Iterable, Iterator, Literal, Optional, TypeVar, Union, cast, overload
 import urllib.parse
 
 from azure.core.exceptions import (
@@ -17,13 +17,14 @@
     ResourceExistsError,
     ResourceNotFoundError,
     ResourceNotModifiedError,
+    StreamClosedError,
+    StreamConsumedError,
     map_error,
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
 from azure.core.polling import LROPoller, NoPolling, PollingMethod
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
@@ -31,12 +32,11 @@
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -582,7 +582,7 @@ def check_name_availability(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.CheckNameAvailabilityResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -616,7 +616,6 @@ def check_name_availability(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -630,7 +629,7 @@ def check_name_availability(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response)
+        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -643,8 +642,8 @@ def _create_initial(
         account_name: str,
         parameters: Union[_models.StorageAccountCreateParameters, IO[bytes]],
         **kwargs: Any
-    ) -> Optional[_models.StorageAccount]:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> Iterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -659,7 +658,7 @@ def _create_initial(
             "api_version", _params.pop("api-version", self._api_version or "2020-08-01-preview")
         )
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
-        cls: ClsType[Optional[_models.StorageAccount]] = kwargs.pop("cls", None)
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
         _json = None
@@ -680,10 +679,10 @@ def _create_initial(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -691,12 +690,14 @@ def _create_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = None
-        if response.status_code == 200:
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -824,10 +825,11 @@ def begin_create(
                 params=_params,
                 **kwargs
             )
+            raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+            deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
             if cls:
                 return cls(pipeline_response, deserialized, {})  # type: ignore
             return deserialized
@@ -866,7 +868,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,
@@ -890,7 +892,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -935,7 +936,7 @@ def get_properties(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -960,7 +961,6 @@ def get_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -974,7 +974,7 @@ def get_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1085,7 +1085,7 @@ def update(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1121,7 +1121,6 @@ def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1135,7 +1134,7 @@ def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1160,7 +1159,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.StorageAccount"]:
         )
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1177,7 +1176,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -1193,7 +1191,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -1243,7 +1240,7 @@ def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> Ite
         )
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1261,7 +1258,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -1277,7 +1273,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -1327,7 +1322,7 @@ def list_keys(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.StorageAccountListKeysResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1352,7 +1347,6 @@ def list_keys(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1366,7 +1360,7 @@ def list_keys(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response)
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1461,7 +1455,7 @@ def regenerate_key(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.StorageAccountListKeysResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1497,7 +1491,6 @@ def regenerate_key(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1511,7 +1504,7 @@ def regenerate_key(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response)
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1603,7 +1596,7 @@ def list_account_sas(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.ListAccountSasResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1639,7 +1632,6 @@ def list_account_sas(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1653,7 +1645,7 @@ def list_account_sas(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListAccountSasResponse", pipeline_response)
+        deserialized = self._deserialize("ListAccountSasResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1743,7 +1735,7 @@ def list_service_sas(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.ListServiceSasResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1779,7 +1771,6 @@ def list_service_sas(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1793,17 +1784,15 @@ def list_service_sas(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListServiceSasResponse", pipeline_response)
+        deserialized = self._deserialize("ListServiceSasResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
 
         return deserialized  # type: ignore
 
-    def _failover_initial(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, **kwargs: Any
-    ) -> None:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    def _failover_initial(self, resource_group_name: str, account_name: str, **kwargs: Any) -> Iterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1817,7 +1806,7 @@ def _failover_initial(  # pylint: disable=inconsistent-return-statements
         api_version: str = kwargs.pop(
             "api_version", _params.pop("api-version", self._api_version or "2020-08-01-preview")
         )
-        cls: ClsType[None] = kwargs.pop("cls", None)
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
 
         _request = build_failover_request(
             resource_group_name=resource_group_name,
@@ -1827,10 +1816,10 @@ def _failover_initial(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -1838,11 +1827,19 @@ def _failover_initial(  # pylint: disable=inconsistent-return-statements
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
-            return cls(pipeline_response, None, {})  # type: ignore
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
 
     @distributed_trace
     def begin_failover(self, resource_group_name: str, account_name: str, **kwargs: Any) -> LROPoller[None]:
@@ -1872,7 +1869,7 @@ def begin_failover(self, resource_group_name: str, account_name: str, **kwargs:
         lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
         cont_token: Optional[str] = kwargs.pop("continuation_token", None)
         if cont_token is None:
-            raw_result = self._failover_initial(  # type: ignore
+            raw_result = self._failover_initial(
                 resource_group_name=resource_group_name,
                 account_name=account_name,
                 api_version=api_version,
@@ -1881,6 +1878,7 @@ def begin_failover(self, resource_group_name: str, account_name: str, **kwargs:
                 params=_params,
                 **kwargs
             )
+            raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
@@ -1910,8 +1908,8 @@ def _restore_blob_ranges_initial(
         account_name: str,
         parameters: Union[_models.BlobRestoreParameters, IO[bytes]],
         **kwargs: Any
-    ) -> _models.BlobRestoreStatus:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> Iterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1926,7 +1924,7 @@ def _restore_blob_ranges_initial(
             "api_version", _params.pop("api-version", self._api_version or "2020-08-01-preview")
         )
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
-        cls: ClsType[_models.BlobRestoreStatus] = kwargs.pop("cls", None)
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
         _json = None
@@ -1947,10 +1945,10 @@ def _restore_blob_ranges_initial(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -1958,14 +1956,14 @@ def _restore_blob_ranges_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response)
-
-        if response.status_code == 202:
-            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response)
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -2084,10 +2082,11 @@ def begin_restore_blob_ranges(
                 params=_params,
                 **kwargs
             )
+            raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):
-            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response)
+            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response.http_response)
             if cls:
                 return cls(pipeline_response, deserialized, {})  # type: ignore
             return deserialized
@@ -2128,7 +2127,7 @@ def revoke_user_delegation_keys(  # pylint: disable=inconsistent-return-statemen
         :rtype: None
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -2152,7 +2151,6 @@ def revoke_user_delegation_keys(  # pylint: disable=inconsistent-return-statemen
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/operations/_table_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/operations/_table_operations.py
index 6b27ec5041ec..29480d8fe8ee 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/operations/_table_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/operations/_table_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 (
@@ -20,20 +19,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -255,7 +252,7 @@ def create(self, resource_group_name: str, account_name: str, table_name: str, *
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.Table
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -280,7 +277,6 @@ def create(self, resource_group_name: str, account_name: str, table_name: str, *
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -294,7 +290,7 @@ def create(self, resource_group_name: str, account_name: str, table_name: str, *
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("Table", pipeline_response)
+        deserialized = self._deserialize("Table", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -320,7 +316,7 @@ def update(self, resource_group_name: str, account_name: str, table_name: str, *
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.Table
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -345,7 +341,6 @@ def update(self, resource_group_name: str, account_name: str, table_name: str, *
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -359,7 +354,7 @@ def update(self, resource_group_name: str, account_name: str, table_name: str, *
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("Table", pipeline_response)
+        deserialized = self._deserialize("Table", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -385,7 +380,7 @@ def get(self, resource_group_name: str, account_name: str, table_name: str, **kw
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.Table
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -410,7 +405,6 @@ def get(self, resource_group_name: str, account_name: str, table_name: str, **kw
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -424,7 +418,7 @@ def get(self, resource_group_name: str, account_name: str, table_name: str, **kw
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("Table", pipeline_response)
+        deserialized = self._deserialize("Table", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -452,7 +446,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,
@@ -477,7 +471,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -517,7 +510,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> It
         )
         cls: ClsType[_models.ListTableResource] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -536,7 +529,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -552,7 +544,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/operations/_table_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/operations/_table_services_operations.py
index d8a3129774f8..fb950a5852c0 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/operations/_table_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/operations/_table_services_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,
@@ -19,20 +18,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -185,7 +182,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.ListTableServices
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -209,7 +206,6 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -223,7 +219,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListTableServices", pipeline_response)
+        deserialized = self._deserialize("ListTableServices", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -331,7 +327,7 @@ def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.TableServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -368,7 +364,6 @@ def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -382,7 +377,7 @@ def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("TableServiceProperties", pipeline_response)
+        deserialized = self._deserialize("TableServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -410,7 +405,7 @@ def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2020_08_01_preview.models.TableServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -435,7 +430,6 @@ def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -449,7 +443,7 @@ def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("TableServiceProperties", pipeline_response)
+        deserialized = self._deserialize("TableServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/operations/_usages_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/operations/_usages_operations.py
index 12031d9e1fad..89910bc7a37f 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/operations/_usages_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2020_08_01_preview/operations/_usages_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 (
@@ -20,20 +19,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -107,7 +104,7 @@ def list_by_location(self, location: str, **kwargs: Any) -> Iterable["_models.Us
         )
         cls: ClsType[_models.UsageListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -125,7 +122,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -141,7 +137,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/__init__.py
index a860a5c185c9..60980065e1ee 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/__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 ._storage_management_client import StorageManagementClient
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._storage_management_client import StorageManagementClient  # 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__ = [
     "StorageManagementClient",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/_configuration.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/_configuration.py
index e7e0e3cbd4d9..8fd3e72d5060 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/_configuration.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/_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 StorageManagementClientConfiguration:  # pylint: disable=too-many-instance-attributes,name-too-long
+class StorageManagementClientConfiguration:  # pylint: disable=too-many-instance-attributes
     """Configuration for StorageManagementClient.
 
     Note that all parameters used to create this instance are saved as instance
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/_metadata.json b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/_metadata.json
index 7cadc332e43e..040b4a2a88ac 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/_metadata.json
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/_metadata.json
@@ -10,8 +10,8 @@
         "azure_arm": true,
         "has_public_lro_operations": true,
         "client_side_validation": false,
-        "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"ARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementClientConfiguration\"], \".._serialization\": [\"Deserializer\", \"Serializer\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}}",
-        "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"AsyncARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"AsyncARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementClientConfiguration\"], \"..._serialization\": [\"Deserializer\", \"Serializer\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"]}}}"
+        "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"ARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementClientConfiguration\"], \".._serialization\": [\"Deserializer\", \"Serializer\"]}, \"stdlib\": {\"typing_extensions\": [\"Self\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}}",
+        "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"AsyncARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"AsyncARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementClientConfiguration\"], \"..._serialization\": [\"Deserializer\", \"Serializer\"]}, \"stdlib\": {\"typing_extensions\": [\"Self\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"]}}}"
     },
     "global_parameters": {
         "sync": {
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/_storage_management_client.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/_storage_management_client.py
index 0fe4ab7a9b91..0b3b6fd8178c 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/_storage_management_client.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/_storage_management_client.py
@@ -8,6 +8,7 @@
 
 from copy import deepcopy
 from typing import Any, TYPE_CHECKING
+from typing_extensions import Self
 
 from azure.core.pipeline import policies
 from azure.core.rest import HttpRequest, HttpResponse
@@ -40,11 +41,10 @@
 )
 
 if TYPE_CHECKING:
-    # pylint: disable=unused-import,ungrouped-imports
     from azure.core.credentials import TokenCredential
 
 
-class StorageManagementClient:  # pylint: disable=client-accepts-api-version-keyword,too-many-instance-attributes
+class StorageManagementClient:  # pylint: disable=too-many-instance-attributes
     """The Azure Storage Management API.
 
     :ivar operations: Operations operations
@@ -211,7 +211,7 @@ def _send_request(self, request: HttpRequest, *, stream: bool = False, **kwargs:
     def close(self) -> None:
         self._client.close()
 
-    def __enter__(self) -> "StorageManagementClient":
+    def __enter__(self) -> Self:
         self._client.__enter__()
         return self
 
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/_vendor.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/_vendor.py
deleted file mode 100644
index 0dafe0e287ff..000000000000
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/_vendor.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# --------------------------------------------------------------------------
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License. See License.txt in the project root for license information.
-# Code generated by Microsoft (R) AutoRest Code Generator.
-# Changes may cause incorrect behavior and will be lost if the code is regenerated.
-# --------------------------------------------------------------------------
-
-from azure.core.pipeline.transport import HttpRequest
-
-
-def _convert_request(request, files=None):
-    data = request.content if not files else None
-    request = HttpRequest(method=request.method, url=request.url, headers=request.headers, data=data)
-    if files:
-        request.set_formdata_body(files)
-    return request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/_version.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/_version.py
index 5a163c0afedc..e5754a47ce68 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/_version.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/_version.py
@@ -6,4 +6,4 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-VERSION = "21.2.1"
\ No newline at end of file
+VERSION = "1.0.0b1"
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/__init__.py
index a5c3d2414cfd..ee2b940bd4fc 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/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 ._storage_management_client import StorageManagementClient
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._storage_management_client import StorageManagementClient  # 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__ = [
     "StorageManagementClient",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/_configuration.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/_configuration.py
index f4f55b7f48b7..aa00151e2cab 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/_configuration.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/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 StorageManagementClientConfiguration:  # pylint: disable=too-many-instance-attributes,name-too-long
+class StorageManagementClientConfiguration:  # pylint: disable=too-many-instance-attributes
     """Configuration for StorageManagementClient.
 
     Note that all parameters used to create this instance are saved as instance
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/_storage_management_client.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/_storage_management_client.py
index 53cf790d9446..d59f6f75108b 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/_storage_management_client.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/_storage_management_client.py
@@ -8,6 +8,7 @@
 
 from copy import deepcopy
 from typing import Any, Awaitable, TYPE_CHECKING
+from typing_extensions import Self
 
 from azure.core.pipeline import policies
 from azure.core.rest import AsyncHttpResponse, HttpRequest
@@ -40,11 +41,10 @@
 )
 
 if TYPE_CHECKING:
-    # pylint: disable=unused-import,ungrouped-imports
     from azure.core.credentials_async import AsyncTokenCredential
 
 
-class StorageManagementClient:  # pylint: disable=client-accepts-api-version-keyword,too-many-instance-attributes
+class StorageManagementClient:  # pylint: disable=too-many-instance-attributes
     """The Azure Storage Management API.
 
     :ivar operations: Operations operations
@@ -216,7 +216,7 @@ def _send_request(
     async def close(self) -> None:
         await self._client.close()
 
-    async def __aenter__(self) -> "StorageManagementClient":
+    async def __aenter__(self) -> Self:
         await self._client.__aenter__()
         return self
 
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/operations/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/operations/__init__.py
index 0f201012e160..d406c5bf4d6b 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/operations/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/operations/__init__.py
@@ -5,29 +5,35 @@
 # 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 ._skus_operations import SkusOperations
-from ._storage_accounts_operations import StorageAccountsOperations
-from ._deleted_accounts_operations import DeletedAccountsOperations
-from ._usages_operations import UsagesOperations
-from ._management_policies_operations import ManagementPoliciesOperations
-from ._blob_inventory_policies_operations import BlobInventoryPoliciesOperations
-from ._private_endpoint_connections_operations import PrivateEndpointConnectionsOperations
-from ._private_link_resources_operations import PrivateLinkResourcesOperations
-from ._object_replication_policies_operations import ObjectReplicationPoliciesOperations
-from ._encryption_scopes_operations import EncryptionScopesOperations
-from ._blob_services_operations import BlobServicesOperations
-from ._blob_containers_operations import BlobContainersOperations
-from ._file_services_operations import FileServicesOperations
-from ._file_shares_operations import FileSharesOperations
-from ._queue_services_operations import QueueServicesOperations
-from ._queue_operations import QueueOperations
-from ._table_services_operations import TableServicesOperations
-from ._table_operations import TableOperations
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._operations import Operations  # type: ignore
+from ._skus_operations import SkusOperations  # type: ignore
+from ._storage_accounts_operations import StorageAccountsOperations  # type: ignore
+from ._deleted_accounts_operations import DeletedAccountsOperations  # type: ignore
+from ._usages_operations import UsagesOperations  # type: ignore
+from ._management_policies_operations import ManagementPoliciesOperations  # type: ignore
+from ._blob_inventory_policies_operations import BlobInventoryPoliciesOperations  # type: ignore
+from ._private_endpoint_connections_operations import PrivateEndpointConnectionsOperations  # type: ignore
+from ._private_link_resources_operations import PrivateLinkResourcesOperations  # type: ignore
+from ._object_replication_policies_operations import ObjectReplicationPoliciesOperations  # type: ignore
+from ._encryption_scopes_operations import EncryptionScopesOperations  # type: ignore
+from ._blob_services_operations import BlobServicesOperations  # type: ignore
+from ._blob_containers_operations import BlobContainersOperations  # type: ignore
+from ._file_services_operations import FileServicesOperations  # type: ignore
+from ._file_shares_operations import FileSharesOperations  # type: ignore
+from ._queue_services_operations import QueueServicesOperations  # type: ignore
+from ._queue_operations import QueueOperations  # type: ignore
+from ._table_services_operations import TableServicesOperations  # type: ignore
+from ._table_operations import TableOperations  # 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__ = [
@@ -51,5 +57,5 @@
     "TableServicesOperations",
     "TableOperations",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/operations/_blob_containers_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/operations/_blob_containers_operations.py
index 21bf97210bdf..2ee9d25280b5 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/operations/_blob_containers_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/operations/_blob_containers_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,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
@@ -21,15 +21,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._blob_containers_operations import (
     build_clear_legal_hold_request,
     build_create_or_update_immutability_policy_request,
@@ -49,7 +47,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]]
 
@@ -114,7 +112,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-01-01"))
         cls: ClsType[_models.ListContainerItems] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -136,7 +134,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -152,7 +149,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -287,7 +283,7 @@ async def create(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -322,7 +318,6 @@ async def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -336,11 +331,7 @@ async def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("BlobContainer", pipeline_response)
-
-        if response.status_code == 201:
-            deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -450,7 +441,7 @@ async def update(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -485,7 +476,6 @@ async def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -499,7 +489,7 @@ async def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -528,7 +518,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -551,7 +541,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -565,7 +554,7 @@ async def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -573,9 +562,7 @@ async def get(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, container_name: str, **kwargs: Any
-    ) -> None:
+    async def delete(self, resource_group_name: str, account_name: str, container_name: str, **kwargs: Any) -> None:
         """Deletes specified container under its account.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -594,7 +581,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,
@@ -617,7 +604,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -740,7 +726,7 @@ async def set_legal_hold(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.LegalHold
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -775,7 +761,6 @@ async def set_legal_hold(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -789,7 +774,7 @@ async def set_legal_hold(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LegalHold", pipeline_response)
+        deserialized = self._deserialize("LegalHold", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -899,7 +884,7 @@ async def clear_legal_hold(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.LegalHold
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -934,7 +919,6 @@ async def clear_legal_hold(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -948,7 +932,7 @@ async def clear_legal_hold(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LegalHold", pipeline_response)
+        deserialized = self._deserialize("LegalHold", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1087,7 +1071,7 @@ async def create_or_update_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1127,7 +1111,6 @@ async def create_or_update_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1144,7 +1127,7 @@ async def create_or_update_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1187,7 +1170,7 @@ async def get_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1212,7 +1195,6 @@ async def get_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1229,7 +1211,7 @@ async def get_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1274,7 +1256,7 @@ async def delete_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1299,7 +1281,6 @@ async def delete_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1316,7 +1297,7 @@ async def delete_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1350,7 +1331,7 @@ async def lock_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1374,7 +1355,6 @@ async def lock_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1391,7 +1371,7 @@ async def lock_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1521,7 +1501,7 @@ async def extend_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1560,7 +1540,6 @@ async def extend_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1577,7 +1556,7 @@ async def extend_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1687,7 +1666,7 @@ async def lease(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.LeaseContainerResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1725,7 +1704,6 @@ async def lease(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1739,7 +1717,7 @@ async def lease(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LeaseContainerResponse", pipeline_response)
+        deserialized = self._deserialize("LeaseContainerResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/operations/_blob_inventory_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/operations/_blob_inventory_policies_operations.py
index 0d3a6570ef86..79366bb7f594 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/operations/_blob_inventory_policies_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/operations/_blob_inventory_policies_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._blob_inventory_policies_operations import (
     build_create_or_update_request,
     build_delete_request,
@@ -40,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]]
 
@@ -90,7 +87,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.BlobInventoryPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -113,7 +110,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -128,7 +124,7 @@ async def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response)
+        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -232,7 +228,7 @@ async def create_or_update(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.BlobInventoryPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -267,7 +263,6 @@ async def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -282,7 +277,7 @@ async def create_or_update(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response)
+        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -290,7 +285,7 @@ async def create_or_update(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
+    async def delete(
         self,
         resource_group_name: str,
         account_name: str,
@@ -314,7 +309,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,
@@ -337,7 +332,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -379,7 +373,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-01-01"))
         cls: ClsType[_models.ListBlobInventoryPolicy] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -398,7 +392,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -414,7 +407,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/operations/_blob_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/operations/_blob_services_operations.py
index 92ebf5702093..8859ee4afff1 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/operations/_blob_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/operations/_blob_services_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._blob_services_operations import (
     build_get_service_properties_request,
     build_list_request,
@@ -39,7 +36,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 +86,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-01-01"))
         cls: ClsType[_models.BlobServiceItems] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -108,7 +105,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -124,7 +120,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -253,7 +248,7 @@ async def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.BlobServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -288,7 +283,6 @@ async def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -302,7 +296,7 @@ async def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobServiceProperties", pipeline_response)
+        deserialized = self._deserialize("BlobServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -330,7 +324,7 @@ async def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.BlobServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -353,7 +347,6 @@ async def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -367,7 +360,7 @@ async def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobServiceProperties", pipeline_response)
+        deserialized = self._deserialize("BlobServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/operations/_deleted_accounts_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/operations/_deleted_accounts_operations.py
index 4b79d70c34e5..5fe11c845948 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/operations/_deleted_accounts_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/operations/_deleted_accounts_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
@@ -20,21 +19,19 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._deleted_accounts_operations import build_get_request, build_list_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
 
@@ -74,7 +71,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.DeletedAccount"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-01-01"))
         cls: ClsType[_models.DeletedAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -91,7 +88,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -107,7 +103,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -149,7 +144,7 @@ async def get(self, deleted_account_name: str, location: str, **kwargs: Any) ->
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.DeletedAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -171,7 +166,6 @@ async def get(self, deleted_account_name: str, location: str, **kwargs: Any) ->
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -186,7 +180,7 @@ async def get(self, deleted_account_name: str, location: str, **kwargs: Any) ->
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("DeletedAccount", pipeline_response)
+        deserialized = self._deserialize("DeletedAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/operations/_encryption_scopes_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/operations/_encryption_scopes_operations.py
index 83e11566a928..2eef70f21c8e 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/operations/_encryption_scopes_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/operations/_encryption_scopes_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._encryption_scopes_operations import (
     build_get_request,
     build_list_request,
@@ -40,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]]
 
@@ -173,7 +170,7 @@ async def put(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.EncryptionScope
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -208,7 +205,6 @@ async def put(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -223,11 +219,7 @@ async def put(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("EncryptionScope", pipeline_response)
-
-        if response.status_code == 201:
-            deserialized = self._deserialize("EncryptionScope", pipeline_response)
+        deserialized = self._deserialize("EncryptionScope", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -337,7 +329,7 @@ async def patch(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.EncryptionScope
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -372,7 +364,6 @@ async def patch(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -387,7 +378,7 @@ async def patch(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("EncryptionScope", pipeline_response)
+        deserialized = self._deserialize("EncryptionScope", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -416,7 +407,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.EncryptionScope
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -439,7 +430,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -454,7 +444,7 @@ async def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("EncryptionScope", pipeline_response)
+        deserialized = self._deserialize("EncryptionScope", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -485,7 +475,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-01-01"))
         cls: ClsType[_models.EncryptionScopeListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -504,7 +494,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -520,7 +509,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/operations/_file_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/operations/_file_services_operations.py
index b14be8b68930..8f21fab1a900 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/operations/_file_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/operations/_file_services_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,
@@ -19,14 +18,12 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._file_services_operations import (
     build_get_service_properties_request,
     build_list_request,
@@ -36,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]]
 
@@ -76,7 +73,7 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.FileServiceItems
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -98,7 +95,6 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -112,7 +108,7 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileServiceItems", pipeline_response)
+        deserialized = self._deserialize("FileServiceItems", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -219,7 +215,7 @@ async def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.FileServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -254,7 +250,6 @@ async def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -268,7 +263,7 @@ async def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileServiceProperties", pipeline_response)
+        deserialized = self._deserialize("FileServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -296,7 +291,7 @@ async def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.FileServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -319,7 +314,6 @@ async def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -333,7 +327,7 @@ async def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileServiceProperties", pipeline_response)
+        deserialized = self._deserialize("FileServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/operations/_file_shares_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/operations/_file_shares_operations.py
index 96b5f9185265..3191d6c1e076 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/operations/_file_shares_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/operations/_file_shares_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, Literal, Optional, Type, TypeVar, Union, overload
+from typing import Any, AsyncIterable, Callable, Dict, IO, Literal, Optional, TypeVar, Union, overload
 import urllib.parse
 
 from azure.core.async_paging import AsyncItemPaged, AsyncList
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._file_shares_operations import (
     build_create_request,
     build_delete_request,
@@ -42,7 +39,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]]
 
@@ -106,7 +103,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-01-01"))
         cls: ClsType[_models.FileShareItems] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -128,7 +125,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -144,7 +140,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -288,7 +283,7 @@ async def create(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.FileShare
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -324,7 +319,6 @@ async def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -338,11 +332,7 @@ async def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("FileShare", pipeline_response)
-
-        if response.status_code == 201:
-            deserialized = self._deserialize("FileShare", pipeline_response)
+        deserialized = self._deserialize("FileShare", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -452,7 +442,7 @@ async def update(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.FileShare
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -487,7 +477,6 @@ async def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -501,7 +490,7 @@ async def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileShare", pipeline_response)
+        deserialized = self._deserialize("FileShare", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -542,7 +531,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.FileShare
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -567,7 +556,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -581,7 +569,7 @@ async def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileShare", pipeline_response)
+        deserialized = self._deserialize("FileShare", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -589,7 +577,7 @@ async def get(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
+    async def delete(
         self,
         resource_group_name: str,
         account_name: str,
@@ -617,7 +605,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,
@@ -641,7 +629,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -659,7 +646,7 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             return cls(pipeline_response, None, {})  # type: ignore
 
     @overload
-    async def restore(  # pylint: disable=inconsistent-return-statements
+    async def restore(
         self,
         resource_group_name: str,
         account_name: str,
@@ -694,7 +681,7 @@ async def restore(  # pylint: disable=inconsistent-return-statements
         """
 
     @overload
-    async def restore(  # pylint: disable=inconsistent-return-statements
+    async def restore(
         self,
         resource_group_name: str,
         account_name: str,
@@ -729,7 +716,7 @@ async def restore(  # pylint: disable=inconsistent-return-statements
         """
 
     @distributed_trace_async
-    async def restore(  # pylint: disable=inconsistent-return-statements
+    async def restore(
         self,
         resource_group_name: str,
         account_name: str,
@@ -757,7 +744,7 @@ async def restore(  # 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,
@@ -792,7 +779,6 @@ async def restore(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/operations/_management_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/operations/_management_policies_operations.py
index b2326511f0e5..22936519418f 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/operations/_management_policies_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/operations/_management_policies_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,
@@ -19,14 +18,12 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._management_policies_operations import (
     build_create_or_update_request,
     build_delete_request,
@@ -36,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]]
 
@@ -86,7 +83,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.ManagementPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -109,7 +106,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -123,7 +119,7 @@ async def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ManagementPolicy", pipeline_response)
+        deserialized = self._deserialize("ManagementPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -227,7 +223,7 @@ async def create_or_update(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.ManagementPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -262,7 +258,6 @@ async def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -276,7 +271,7 @@ async def create_or_update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ManagementPolicy", pipeline_response)
+        deserialized = self._deserialize("ManagementPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -284,7 +279,7 @@ async def create_or_update(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
+    async def delete(
         self,
         resource_group_name: str,
         account_name: str,
@@ -308,7 +303,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,
@@ -331,7 +326,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/operations/_object_replication_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/operations/_object_replication_policies_operations.py
index f946224b2c85..04ef2eb5e65b 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/operations/_object_replication_policies_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/operations/_object_replication_policies_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._object_replication_policies_operations import (
     build_create_or_update_request,
     build_delete_request,
@@ -40,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]]
 
@@ -90,7 +87,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-01-01"))
         cls: ClsType[_models.ObjectReplicationPolicies] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -109,7 +106,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -125,7 +121,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -175,7 +170,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.ObjectReplicationPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -198,7 +193,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -213,7 +207,7 @@ async def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response)
+        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -317,7 +311,7 @@ async def create_or_update(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.ObjectReplicationPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -352,7 +346,6 @@ async def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -367,7 +360,7 @@ async def create_or_update(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response)
+        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -375,7 +368,7 @@ async def create_or_update(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
+    async def delete(
         self, resource_group_name: str, account_name: str, object_replication_policy_id: str, **kwargs: Any
     ) -> None:
         """Deletes the object replication policy associated with the specified storage account.
@@ -394,7 +387,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,
@@ -417,7 +410,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/operations/_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/operations/_operations.py
index af976c478c72..c285a87575be 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/operations/_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/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
@@ -20,20 +19,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._operations import build_list_request
 
 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]]
 
@@ -73,7 +70,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.Operation"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-01-01"))
         cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -89,7 +86,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -105,7 +101,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/operations/_private_endpoint_connections_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/operations/_private_endpoint_connections_operations.py
index eb743576ec5e..7c56b63f8078 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/operations/_private_endpoint_connections_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/operations/_private_endpoint_connections_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._private_endpoint_connections_operations import (
     build_delete_request,
     build_get_request,
@@ -40,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]]
 
@@ -90,7 +87,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-01-01"))
         cls: ClsType[_models.PrivateEndpointConnectionListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -109,7 +106,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -125,7 +121,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -174,7 +169,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.PrivateEndpointConnection
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -197,7 +192,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -212,7 +206,7 @@ async def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response)
+        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -313,7 +307,7 @@ async def put(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.PrivateEndpointConnection
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -348,7 +342,6 @@ async def put(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -363,7 +356,7 @@ async def put(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response)
+        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -371,7 +364,7 @@ async def put(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
+    async def delete(
         self, resource_group_name: str, account_name: str, private_endpoint_connection_name: str, **kwargs: Any
     ) -> None:
         """Deletes the specified private endpoint connection associated with the storage account.
@@ -390,7 +383,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,
@@ -413,7 +406,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/operations/_private_link_resources_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/operations/_private_link_resources_operations.py
index fa1888354890..9e3199de8c17 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/operations/_private_link_resources_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/operations/_private_link_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, Optional, Type, TypeVar
+from typing import Any, Callable, Dict, Optional, TypeVar
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -18,20 +17,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._private_link_resources_operations import build_list_by_storage_account_request
 
 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]]
 
@@ -73,7 +70,7 @@ async def list_by_storage_account(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.PrivateLinkResourceListResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -95,7 +92,6 @@ async def list_by_storage_account(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -109,7 +105,7 @@ async def list_by_storage_account(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("PrivateLinkResourceListResult", pipeline_response)
+        deserialized = self._deserialize("PrivateLinkResourceListResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/operations/_queue_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/operations/_queue_operations.py
index 568bae7a5151..d2dda8b1ea17 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/operations/_queue_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/operations/_queue_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._queue_operations import (
     build_create_request,
     build_delete_request,
@@ -41,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]]
 
@@ -166,7 +163,7 @@ async def create(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.StorageQueue
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -201,7 +198,6 @@ async def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -215,7 +211,7 @@ async def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageQueue", pipeline_response)
+        deserialized = self._deserialize("StorageQueue", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -322,7 +318,7 @@ async def update(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.StorageQueue
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -357,7 +353,6 @@ async def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -371,7 +366,7 @@ async def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageQueue", pipeline_response)
+        deserialized = self._deserialize("StorageQueue", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -400,7 +395,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.StorageQueue
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -423,7 +418,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -437,7 +431,7 @@ async def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageQueue", pipeline_response)
+        deserialized = self._deserialize("StorageQueue", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -445,9 +439,7 @@ async def get(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, queue_name: str, **kwargs: Any
-    ) -> None:
+    async def delete(self, resource_group_name: str, account_name: str, queue_name: str, **kwargs: Any) -> None:
         """Deletes the queue with the specified queue name, under the specified account if it exists.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -466,7 +458,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,
@@ -489,7 +481,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -541,7 +532,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-01-01"))
         cls: ClsType[_models.ListQueueResource] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -562,7 +553,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -578,7 +568,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/operations/_queue_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/operations/_queue_services_operations.py
index c4c9410c7179..787e432bdf3d 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/operations/_queue_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/operations/_queue_services_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,
@@ -19,14 +18,12 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._queue_services_operations import (
     build_get_service_properties_request,
     build_list_request,
@@ -36,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]]
 
@@ -76,7 +73,7 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.ListQueueServices
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -98,7 +95,6 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -112,7 +108,7 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListQueueServices", pipeline_response)
+        deserialized = self._deserialize("ListQueueServices", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -219,7 +215,7 @@ async def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.QueueServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -254,7 +250,6 @@ async def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -268,7 +263,7 @@ async def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("QueueServiceProperties", pipeline_response)
+        deserialized = self._deserialize("QueueServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -296,7 +291,7 @@ async def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.QueueServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -319,7 +314,6 @@ async def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -333,7 +327,7 @@ async def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("QueueServiceProperties", pipeline_response)
+        deserialized = self._deserialize("QueueServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/operations/_skus_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/operations/_skus_operations.py
index 2a5b63c43d71..1eaafb7c7bc9 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/operations/_skus_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/operations/_skus_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
@@ -20,20 +19,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._skus_operations import build_list_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
 
@@ -73,7 +70,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.SkuInformation"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-01-01"))
         cls: ClsType[_models.StorageSkuListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -90,7 +87,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -106,7 +102,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/operations/_storage_accounts_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/operations/_storage_accounts_operations.py
index 3bf028862a44..882137af2eea 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/operations/_storage_accounts_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/operations/_storage_accounts_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,20 @@
 # --------------------------------------------------------------------------
 from io import IOBase
 import sys
-from typing import Any, AsyncIterable, Callable, Dict, IO, Literal, Optional, Type, TypeVar, Union, cast, overload
+from typing import (
+    Any,
+    AsyncIterable,
+    AsyncIterator,
+    Callable,
+    Dict,
+    IO,
+    Literal,
+    Optional,
+    TypeVar,
+    Union,
+    cast,
+    overload,
+)
 import urllib.parse
 
 from azure.core.async_paging import AsyncItemPaged, AsyncList
@@ -18,12 +31,13 @@
     ResourceExistsError,
     ResourceNotFoundError,
     ResourceNotModifiedError,
+    StreamClosedError,
+    StreamConsumedError,
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
 from azure.core.polling import AsyncLROPoller, AsyncNoPolling, AsyncPollingMethod
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
@@ -31,7 +45,6 @@
 from azure.mgmt.core.polling.async_arm_polling import AsyncARMPolling
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._storage_accounts_operations import (
     build_check_name_availability_request,
     build_create_request,
@@ -52,7 +65,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]]
 
@@ -135,7 +148,7 @@ async def check_name_availability(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.CheckNameAvailabilityResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -167,7 +180,6 @@ async def check_name_availability(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -181,7 +193,7 @@ async def check_name_availability(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response)
+        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -194,8 +206,8 @@ async def _create_initial(
         account_name: str,
         parameters: Union[_models.StorageAccountCreateParameters, IO[bytes]],
         **kwargs: Any
-    ) -> Optional[_models.StorageAccount]:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -208,7 +220,7 @@ async def _create_initial(
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-01-01"))
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
-        cls: ClsType[Optional[_models.StorageAccount]] = kwargs.pop("cls", None)
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
         _json = None
@@ -229,10 +241,10 @@ async def _create_initial(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -240,12 +252,14 @@ async def _create_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = None
-        if response.status_code == 200:
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -371,10 +385,11 @@ async def begin_create(
                 params=_params,
                 **kwargs
             )
+            await raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+            deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
             if cls:
                 return cls(pipeline_response, deserialized, {})  # type: ignore
             return deserialized
@@ -397,9 +412,7 @@ def get_long_running_output(pipeline_response):
         )
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, **kwargs: Any
-    ) -> None:
+    async def delete(self, resource_group_name: str, account_name: str, **kwargs: Any) -> None:
         """Deletes a storage account in Microsoft Azure.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -413,7 +426,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,
@@ -435,7 +448,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -480,7 +492,7 @@ async def get_properties(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -503,7 +515,6 @@ async def get_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -517,7 +528,7 @@ async def get_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -628,7 +639,7 @@ async def update(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -662,7 +673,6 @@ async def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -676,7 +686,7 @@ async def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -699,7 +709,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.StorageAccount"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-01-01"))
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -716,7 +726,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -732,7 +741,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -782,7 +790,7 @@ def list_by_resource_group(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-01-01"))
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -800,7 +808,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -816,7 +823,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -866,7 +872,7 @@ async def list_keys(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.StorageAccountListKeysResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -889,7 +895,6 @@ async def list_keys(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -903,7 +908,7 @@ async def list_keys(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response)
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -997,7 +1002,7 @@ async def regenerate_key(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.StorageAccountListKeysResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1031,7 +1036,6 @@ async def regenerate_key(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1045,7 +1049,7 @@ async def regenerate_key(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response)
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1136,7 +1140,7 @@ async def list_account_sas(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.ListAccountSasResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1170,7 +1174,6 @@ async def list_account_sas(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1184,7 +1187,7 @@ async def list_account_sas(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListAccountSasResponse", pipeline_response)
+        deserialized = self._deserialize("ListAccountSasResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1273,7 +1276,7 @@ async def list_service_sas(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.ListServiceSasResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1307,7 +1310,6 @@ async def list_service_sas(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1321,17 +1323,17 @@ async def list_service_sas(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListServiceSasResponse", pipeline_response)
+        deserialized = self._deserialize("ListServiceSasResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
 
         return deserialized  # type: ignore
 
-    async def _failover_initial(  # pylint: disable=inconsistent-return-statements
+    async def _failover_initial(
         self, resource_group_name: str, account_name: str, **kwargs: Any
-    ) -> None:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1343,7 +1345,7 @@ async def _failover_initial(  # pylint: disable=inconsistent-return-statements
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-01-01"))
-        cls: ClsType[None] = kwargs.pop("cls", None)
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
 
         _request = build_failover_request(
             resource_group_name=resource_group_name,
@@ -1353,10 +1355,10 @@ async def _failover_initial(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -1364,11 +1366,19 @@ async def _failover_initial(  # pylint: disable=inconsistent-return-statements
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
-            return cls(pipeline_response, None, {})  # type: ignore
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
 
     @distributed_trace_async
     async def begin_failover(self, resource_group_name: str, account_name: str, **kwargs: Any) -> AsyncLROPoller[None]:
@@ -1396,7 +1406,7 @@ async def begin_failover(self, resource_group_name: str, account_name: str, **kw
         lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
         cont_token: Optional[str] = kwargs.pop("continuation_token", None)
         if cont_token is None:
-            raw_result = await self._failover_initial(  # type: ignore
+            raw_result = await self._failover_initial(
                 resource_group_name=resource_group_name,
                 account_name=account_name,
                 api_version=api_version,
@@ -1405,6 +1415,7 @@ async def begin_failover(self, resource_group_name: str, account_name: str, **kw
                 params=_params,
                 **kwargs
             )
+            await raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
@@ -1434,8 +1445,8 @@ async def _restore_blob_ranges_initial(
         account_name: str,
         parameters: Union[_models.BlobRestoreParameters, IO[bytes]],
         **kwargs: Any
-    ) -> _models.BlobRestoreStatus:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1448,7 +1459,7 @@ async def _restore_blob_ranges_initial(
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-01-01"))
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
-        cls: ClsType[_models.BlobRestoreStatus] = kwargs.pop("cls", None)
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
         _json = None
@@ -1469,10 +1480,10 @@ async def _restore_blob_ranges_initial(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -1480,14 +1491,14 @@ async def _restore_blob_ranges_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response)
-
-        if response.status_code == 202:
-            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response)
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1603,10 +1614,11 @@ async def begin_restore_blob_ranges(
                 params=_params,
                 **kwargs
             )
+            await raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):
-            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response)
+            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response.http_response)
             if cls:
                 return cls(pipeline_response, deserialized, {})  # type: ignore
             return deserialized
@@ -1631,9 +1643,7 @@ def get_long_running_output(pipeline_response):
         )
 
     @distributed_trace_async
-    async def revoke_user_delegation_keys(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, **kwargs: Any
-    ) -> None:
+    async def revoke_user_delegation_keys(self, resource_group_name: str, account_name: str, **kwargs: Any) -> None:
         """Revoke user delegation keys.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -1647,7 +1657,7 @@ async def revoke_user_delegation_keys(  # pylint: disable=inconsistent-return-st
         :rtype: None
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1669,7 +1679,6 @@ async def revoke_user_delegation_keys(  # pylint: disable=inconsistent-return-st
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/operations/_table_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/operations/_table_operations.py
index 83734d9e3f62..346a1fed2f7f 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/operations/_table_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/operations/_table_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
@@ -20,15 +19,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._table_operations import (
     build_create_request,
     build_delete_request,
@@ -40,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]]
 
@@ -86,7 +83,7 @@ async def create(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.Table
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -109,7 +106,6 @@ async def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -123,7 +119,7 @@ async def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("Table", pipeline_response)
+        deserialized = self._deserialize("Table", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -151,7 +147,7 @@ async def update(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.Table
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -174,7 +170,6 @@ async def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -188,7 +183,7 @@ async def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("Table", pipeline_response)
+        deserialized = self._deserialize("Table", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -214,7 +209,7 @@ async def get(self, resource_group_name: str, account_name: str, table_name: str
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.Table
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -237,7 +232,6 @@ async def get(self, resource_group_name: str, account_name: str, table_name: str
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -251,7 +245,7 @@ async def get(self, resource_group_name: str, account_name: str, table_name: str
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("Table", pipeline_response)
+        deserialized = self._deserialize("Table", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -259,9 +253,7 @@ async def get(self, resource_group_name: str, account_name: str, table_name: str
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, table_name: str, **kwargs: Any
-    ) -> None:
+    async def delete(self, resource_group_name: str, account_name: str, table_name: str, **kwargs: Any) -> None:
         """Deletes the table with the specified table name, under the specified account if it exists.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -279,7 +271,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,
@@ -302,7 +294,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -340,7 +331,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> As
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-01-01"))
         cls: ClsType[_models.ListTableResource] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -359,7 +350,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -375,7 +365,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/operations/_table_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/operations/_table_services_operations.py
index 78c6d52dee4c..acfafe799084 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/operations/_table_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/operations/_table_services_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,
@@ -19,14 +18,12 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._table_services_operations import (
     build_get_service_properties_request,
     build_list_request,
@@ -36,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]]
 
@@ -76,7 +73,7 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.ListTableServices
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -98,7 +95,6 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -112,7 +108,7 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListTableServices", pipeline_response)
+        deserialized = self._deserialize("ListTableServices", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -219,7 +215,7 @@ async def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.TableServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -254,7 +250,6 @@ async def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -268,7 +263,7 @@ async def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("TableServiceProperties", pipeline_response)
+        deserialized = self._deserialize("TableServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -296,7 +291,7 @@ async def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.TableServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -319,7 +314,6 @@ async def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -333,7 +327,7 @@ async def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("TableServiceProperties", pipeline_response)
+        deserialized = self._deserialize("TableServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/operations/_usages_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/operations/_usages_operations.py
index 0edd3411a409..f166ceba4b30 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/operations/_usages_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/aio/operations/_usages_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
@@ -20,20 +19,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._usages_operations import build_list_by_location_request
 
 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 +72,7 @@ def list_by_location(self, location: str, **kwargs: Any) -> AsyncIterable["_mode
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-01-01"))
         cls: ClsType[_models.UsageListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -93,7 +90,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -109,7 +105,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/models/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/models/__init__.py
index d9bfdc0c6101..82e6b85e15b8 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/models/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/models/__init__.py
@@ -5,192 +5,203 @@
 # 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 AccountSasParameters
-from ._models_py3 import ActiveDirectoryProperties
-from ._models_py3 import AzureEntityResource
-from ._models_py3 import AzureFilesIdentityBasedAuthentication
-from ._models_py3 import BlobContainer
-from ._models_py3 import BlobInventoryPolicy
-from ._models_py3 import BlobInventoryPolicyDefinition
-from ._models_py3 import BlobInventoryPolicyFilter
-from ._models_py3 import BlobInventoryPolicyRule
-from ._models_py3 import BlobInventoryPolicySchema
-from ._models_py3 import BlobRestoreParameters
-from ._models_py3 import BlobRestoreRange
-from ._models_py3 import BlobRestoreStatus
-from ._models_py3 import BlobServiceItems
-from ._models_py3 import BlobServiceProperties
-from ._models_py3 import ChangeFeed
-from ._models_py3 import CheckNameAvailabilityResult
-from ._models_py3 import CloudErrorBody
-from ._models_py3 import CorsRule
-from ._models_py3 import CorsRules
-from ._models_py3 import CustomDomain
-from ._models_py3 import DateAfterCreation
-from ._models_py3 import DateAfterModification
-from ._models_py3 import DeleteRetentionPolicy
-from ._models_py3 import DeletedAccount
-from ._models_py3 import DeletedAccountListResult
-from ._models_py3 import DeletedShare
-from ._models_py3 import Dimension
-from ._models_py3 import Encryption
-from ._models_py3 import EncryptionIdentity
-from ._models_py3 import EncryptionScope
-from ._models_py3 import EncryptionScopeKeyVaultProperties
-from ._models_py3 import EncryptionScopeListResult
-from ._models_py3 import EncryptionService
-from ._models_py3 import EncryptionServices
-from ._models_py3 import Endpoints
-from ._models_py3 import ErrorResponse
-from ._models_py3 import ErrorResponseBody
-from ._models_py3 import ExtendedLocation
-from ._models_py3 import FileServiceItems
-from ._models_py3 import FileServiceProperties
-from ._models_py3 import FileShare
-from ._models_py3 import FileShareItem
-from ._models_py3 import FileShareItems
-from ._models_py3 import GeoReplicationStats
-from ._models_py3 import IPRule
-from ._models_py3 import Identity
-from ._models_py3 import ImmutabilityPolicy
-from ._models_py3 import ImmutabilityPolicyProperties
-from ._models_py3 import KeyVaultProperties
-from ._models_py3 import LastAccessTimeTrackingPolicy
-from ._models_py3 import LeaseContainerRequest
-from ._models_py3 import LeaseContainerResponse
-from ._models_py3 import LegalHold
-from ._models_py3 import LegalHoldProperties
-from ._models_py3 import ListAccountSasResponse
-from ._models_py3 import ListBlobInventoryPolicy
-from ._models_py3 import ListContainerItem
-from ._models_py3 import ListContainerItems
-from ._models_py3 import ListQueue
-from ._models_py3 import ListQueueResource
-from ._models_py3 import ListQueueServices
-from ._models_py3 import ListServiceSasResponse
-from ._models_py3 import ListTableResource
-from ._models_py3 import ListTableServices
-from ._models_py3 import ManagementPolicy
-from ._models_py3 import ManagementPolicyAction
-from ._models_py3 import ManagementPolicyBaseBlob
-from ._models_py3 import ManagementPolicyDefinition
-from ._models_py3 import ManagementPolicyFilter
-from ._models_py3 import ManagementPolicyRule
-from ._models_py3 import ManagementPolicySchema
-from ._models_py3 import ManagementPolicySnapShot
-from ._models_py3 import ManagementPolicyVersion
-from ._models_py3 import MetricSpecification
-from ._models_py3 import Multichannel
-from ._models_py3 import NetworkRuleSet
-from ._models_py3 import ObjectReplicationPolicies
-from ._models_py3 import ObjectReplicationPolicy
-from ._models_py3 import ObjectReplicationPolicyFilter
-from ._models_py3 import ObjectReplicationPolicyRule
-from ._models_py3 import Operation
-from ._models_py3 import OperationDisplay
-from ._models_py3 import OperationListResult
-from ._models_py3 import PrivateEndpoint
-from ._models_py3 import PrivateEndpointConnection
-from ._models_py3 import PrivateEndpointConnectionListResult
-from ._models_py3 import PrivateLinkResource
-from ._models_py3 import PrivateLinkResourceListResult
-from ._models_py3 import PrivateLinkServiceConnectionState
-from ._models_py3 import ProtocolSettings
-from ._models_py3 import ProxyResource
-from ._models_py3 import QueueServiceProperties
-from ._models_py3 import Resource
-from ._models_py3 import ResourceAccessRule
-from ._models_py3 import RestorePolicyProperties
-from ._models_py3 import Restriction
-from ._models_py3 import RoutingPreference
-from ._models_py3 import SKUCapability
-from ._models_py3 import ServiceSasParameters
-from ._models_py3 import ServiceSpecification
-from ._models_py3 import Sku
-from ._models_py3 import SkuInformation
-from ._models_py3 import SmbSetting
-from ._models_py3 import StorageAccount
-from ._models_py3 import StorageAccountCheckNameAvailabilityParameters
-from ._models_py3 import StorageAccountCreateParameters
-from ._models_py3 import StorageAccountInternetEndpoints
-from ._models_py3 import StorageAccountKey
-from ._models_py3 import StorageAccountListKeysResult
-from ._models_py3 import StorageAccountListResult
-from ._models_py3 import StorageAccountMicrosoftEndpoints
-from ._models_py3 import StorageAccountRegenerateKeyParameters
-from ._models_py3 import StorageAccountUpdateParameters
-from ._models_py3 import StorageQueue
-from ._models_py3 import StorageSkuListResult
-from ._models_py3 import SystemData
-from ._models_py3 import Table
-from ._models_py3 import TableServiceProperties
-from ._models_py3 import TagFilter
-from ._models_py3 import TagProperty
-from ._models_py3 import TrackedResource
-from ._models_py3 import UpdateHistoryProperty
-from ._models_py3 import Usage
-from ._models_py3 import UsageListResult
-from ._models_py3 import UsageName
-from ._models_py3 import UserAssignedIdentity
-from ._models_py3 import VirtualNetworkRule
+from typing import TYPE_CHECKING
 
-from ._storage_management_client_enums import AccessTier
-from ._storage_management_client_enums import AccountStatus
-from ._storage_management_client_enums import BlobInventoryPolicyName
-from ._storage_management_client_enums import BlobRestoreProgressStatus
-from ._storage_management_client_enums import Bypass
-from ._storage_management_client_enums import CorsRuleAllowedMethodsItem
-from ._storage_management_client_enums import CreatedByType
-from ._storage_management_client_enums import DefaultAction
-from ._storage_management_client_enums import DirectoryServiceOptions
-from ._storage_management_client_enums import EnabledProtocols
-from ._storage_management_client_enums import EncryptionScopeSource
-from ._storage_management_client_enums import EncryptionScopeState
-from ._storage_management_client_enums import Enum30
-from ._storage_management_client_enums import ExtendedLocationTypes
-from ._storage_management_client_enums import GeoReplicationStatus
-from ._storage_management_client_enums import HttpProtocol
-from ._storage_management_client_enums import IdentityType
-from ._storage_management_client_enums import ImmutabilityPolicyState
-from ._storage_management_client_enums import ImmutabilityPolicyUpdateType
-from ._storage_management_client_enums import InventoryRuleType
-from ._storage_management_client_enums import KeyPermission
-from ._storage_management_client_enums import KeySource
-from ._storage_management_client_enums import KeyType
-from ._storage_management_client_enums import Kind
-from ._storage_management_client_enums import LargeFileSharesState
-from ._storage_management_client_enums import LeaseContainerRequestAction
-from ._storage_management_client_enums import LeaseDuration
-from ._storage_management_client_enums import LeaseState
-from ._storage_management_client_enums import LeaseStatus
-from ._storage_management_client_enums import ListContainersInclude
-from ._storage_management_client_enums import ListSharesExpand
-from ._storage_management_client_enums import ManagementPolicyName
-from ._storage_management_client_enums import MinimumTlsVersion
-from ._storage_management_client_enums import Name
-from ._storage_management_client_enums import Permissions
-from ._storage_management_client_enums import PrivateEndpointConnectionProvisioningState
-from ._storage_management_client_enums import PrivateEndpointServiceConnectionStatus
-from ._storage_management_client_enums import ProvisioningState
-from ._storage_management_client_enums import PublicAccess
-from ._storage_management_client_enums import PutSharesExpand
-from ._storage_management_client_enums import Reason
-from ._storage_management_client_enums import ReasonCode
-from ._storage_management_client_enums import RootSquashType
-from ._storage_management_client_enums import RoutingChoice
-from ._storage_management_client_enums import RuleType
-from ._storage_management_client_enums import Services
-from ._storage_management_client_enums import ShareAccessTier
-from ._storage_management_client_enums import SignedResource
-from ._storage_management_client_enums import SignedResourceTypes
-from ._storage_management_client_enums import SkuName
-from ._storage_management_client_enums import SkuTier
-from ._storage_management_client_enums import State
-from ._storage_management_client_enums import StorageAccountExpand
-from ._storage_management_client_enums import UsageUnit
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+
+from ._models_py3 import (  # type: ignore
+    AccountSasParameters,
+    ActiveDirectoryProperties,
+    AzureEntityResource,
+    AzureFilesIdentityBasedAuthentication,
+    BlobContainer,
+    BlobInventoryPolicy,
+    BlobInventoryPolicyDefinition,
+    BlobInventoryPolicyFilter,
+    BlobInventoryPolicyRule,
+    BlobInventoryPolicySchema,
+    BlobRestoreParameters,
+    BlobRestoreRange,
+    BlobRestoreStatus,
+    BlobServiceItems,
+    BlobServiceProperties,
+    ChangeFeed,
+    CheckNameAvailabilityResult,
+    CloudErrorBody,
+    CorsRule,
+    CorsRules,
+    CustomDomain,
+    DateAfterCreation,
+    DateAfterModification,
+    DeleteRetentionPolicy,
+    DeletedAccount,
+    DeletedAccountListResult,
+    DeletedShare,
+    Dimension,
+    Encryption,
+    EncryptionIdentity,
+    EncryptionScope,
+    EncryptionScopeKeyVaultProperties,
+    EncryptionScopeListResult,
+    EncryptionService,
+    EncryptionServices,
+    Endpoints,
+    ErrorResponse,
+    ErrorResponseBody,
+    ExtendedLocation,
+    FileServiceItems,
+    FileServiceProperties,
+    FileShare,
+    FileShareItem,
+    FileShareItems,
+    GeoReplicationStats,
+    IPRule,
+    Identity,
+    ImmutabilityPolicy,
+    ImmutabilityPolicyProperties,
+    KeyVaultProperties,
+    LastAccessTimeTrackingPolicy,
+    LeaseContainerRequest,
+    LeaseContainerResponse,
+    LegalHold,
+    LegalHoldProperties,
+    ListAccountSasResponse,
+    ListBlobInventoryPolicy,
+    ListContainerItem,
+    ListContainerItems,
+    ListQueue,
+    ListQueueResource,
+    ListQueueServices,
+    ListServiceSasResponse,
+    ListTableResource,
+    ListTableServices,
+    ManagementPolicy,
+    ManagementPolicyAction,
+    ManagementPolicyBaseBlob,
+    ManagementPolicyDefinition,
+    ManagementPolicyFilter,
+    ManagementPolicyRule,
+    ManagementPolicySchema,
+    ManagementPolicySnapShot,
+    ManagementPolicyVersion,
+    MetricSpecification,
+    Multichannel,
+    NetworkRuleSet,
+    ObjectReplicationPolicies,
+    ObjectReplicationPolicy,
+    ObjectReplicationPolicyFilter,
+    ObjectReplicationPolicyRule,
+    Operation,
+    OperationDisplay,
+    OperationListResult,
+    PrivateEndpoint,
+    PrivateEndpointConnection,
+    PrivateEndpointConnectionListResult,
+    PrivateLinkResource,
+    PrivateLinkResourceListResult,
+    PrivateLinkServiceConnectionState,
+    ProtocolSettings,
+    ProxyResource,
+    QueueServiceProperties,
+    Resource,
+    ResourceAccessRule,
+    RestorePolicyProperties,
+    Restriction,
+    RoutingPreference,
+    SKUCapability,
+    ServiceSasParameters,
+    ServiceSpecification,
+    Sku,
+    SkuInformation,
+    SmbSetting,
+    StorageAccount,
+    StorageAccountCheckNameAvailabilityParameters,
+    StorageAccountCreateParameters,
+    StorageAccountInternetEndpoints,
+    StorageAccountKey,
+    StorageAccountListKeysResult,
+    StorageAccountListResult,
+    StorageAccountMicrosoftEndpoints,
+    StorageAccountRegenerateKeyParameters,
+    StorageAccountUpdateParameters,
+    StorageQueue,
+    StorageSkuListResult,
+    SystemData,
+    Table,
+    TableServiceProperties,
+    TagFilter,
+    TagProperty,
+    TrackedResource,
+    UpdateHistoryProperty,
+    Usage,
+    UsageListResult,
+    UsageName,
+    UserAssignedIdentity,
+    VirtualNetworkRule,
+)
+
+from ._storage_management_client_enums import (  # type: ignore
+    AccessTier,
+    AccountStatus,
+    BlobInventoryPolicyName,
+    BlobRestoreProgressStatus,
+    Bypass,
+    CorsRuleAllowedMethodsItem,
+    CreatedByType,
+    DefaultAction,
+    DirectoryServiceOptions,
+    EnabledProtocols,
+    EncryptionScopeSource,
+    EncryptionScopeState,
+    Enum30,
+    ExtendedLocationTypes,
+    GeoReplicationStatus,
+    HttpProtocol,
+    IdentityType,
+    ImmutabilityPolicyState,
+    ImmutabilityPolicyUpdateType,
+    InventoryRuleType,
+    KeyPermission,
+    KeySource,
+    KeyType,
+    Kind,
+    LargeFileSharesState,
+    LeaseContainerRequestAction,
+    LeaseDuration,
+    LeaseState,
+    LeaseStatus,
+    ListContainersInclude,
+    ListSharesExpand,
+    ManagementPolicyName,
+    MinimumTlsVersion,
+    Name,
+    Permissions,
+    PrivateEndpointConnectionProvisioningState,
+    PrivateEndpointServiceConnectionStatus,
+    ProvisioningState,
+    PublicAccess,
+    PutSharesExpand,
+    Reason,
+    ReasonCode,
+    RootSquashType,
+    RoutingChoice,
+    RuleType,
+    Services,
+    ShareAccessTier,
+    SignedResource,
+    SignedResourceTypes,
+    SkuName,
+    SkuTier,
+    State,
+    StorageAccountExpand,
+    UsageUnit,
+)
 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__ = [
@@ -377,5 +388,5 @@
     "StorageAccountExpand",
     "UsageUnit",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/models/_models_py3.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/models/_models_py3.py
index c05583b8f84c..a50d7a3a981d 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/models/_models_py3.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/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
 
 
@@ -309,7 +308,7 @@ def __init__(
         self.active_directory_properties = active_directory_properties
 
 
-class BlobContainer(AzureEntityResource):  # pylint: disable=too-many-instance-attributes
+class BlobContainer(AzureEntityResource):
     """Properties of the blob container, including Id, resource name, resource type, Etag.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -819,7 +818,7 @@ def __init__(self, **kwargs: Any) -> None:
         self.value = None
 
 
-class BlobServiceProperties(Resource):  # pylint: disable=too-many-instance-attributes
+class BlobServiceProperties(Resource):
     """The properties of a storage account’s Blob service.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -2063,7 +2062,7 @@ def __init__(
         self.protocol_settings = protocol_settings
 
 
-class FileShare(AzureEntityResource):  # pylint: disable=too-many-instance-attributes
+class FileShare(AzureEntityResource):
     """Properties of the file share, including Id, resource name, resource type, Etag.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -2197,7 +2196,7 @@ def __init__(
         self.snapshot_time = None
 
 
-class FileShareItem(AzureEntityResource):  # pylint: disable=too-many-instance-attributes
+class FileShareItem(AzureEntityResource):
     """The file share properties be listed out.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -2757,7 +2756,7 @@ class LeaseContainerRequest(_serialization.Model):
     All required parameters must be populated in order to send to server.
 
     :ivar action: Specifies the lease action. Can be one of the available actions. Required. Known
-     values are: "Acquire", "Renew", "Change", "Release", and "Break".
+     values are: "Acquire", "Renew", "Change", "Release", "Break", and "Break".
     :vartype action: str or ~azure.mgmt.storage.v2021_01_01.models.LeaseContainerRequestAction
     :ivar lease_id: Identifies the lease. Can be specified in any valid GUID string format.
     :vartype lease_id: str
@@ -2796,7 +2795,7 @@ def __init__(
     ) -> None:
         """
         :keyword action: Specifies the lease action. Can be one of the available actions. Required.
-         Known values are: "Acquire", "Renew", "Change", "Release", and "Break".
+         Known values are: "Acquire", "Renew", "Change", "Release", "Break", and "Break".
         :paramtype action: str or ~azure.mgmt.storage.v2021_01_01.models.LeaseContainerRequestAction
         :keyword lease_id: Identifies the lease. Can be specified in any valid GUID string format.
         :paramtype lease_id: str
@@ -2965,7 +2964,7 @@ def __init__(self, **kwargs: Any) -> None:
         self.value = None
 
 
-class ListContainerItem(AzureEntityResource):  # pylint: disable=too-many-instance-attributes
+class ListContainerItem(AzureEntityResource):
     """The blob container properties be listed out.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -4611,7 +4610,7 @@ def __init__(
         self.publish_internet_endpoints = publish_internet_endpoints
 
 
-class ServiceSasParameters(_serialization.Model):  # pylint: disable=too-many-instance-attributes
+class ServiceSasParameters(_serialization.Model):
     """The parameters to list service SAS credentials of a specific resource.
 
     All required parameters must be populated in order to send to server.
@@ -5057,7 +5056,7 @@ def __init__(self, *, location: str, tags: Optional[Dict[str, str]] = None, **kw
         self.location = location
 
 
-class StorageAccount(TrackedResource):  # pylint: disable=too-many-instance-attributes
+class StorageAccount(TrackedResource):
     """The storage account.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -5363,7 +5362,7 @@ def __init__(self, *, name: str, **kwargs: Any) -> None:
         self.name = name
 
 
-class StorageAccountCreateParameters(_serialization.Model):  # pylint: disable=too-many-instance-attributes
+class StorageAccountCreateParameters(_serialization.Model):
     """The parameters used when creating a storage account.
 
     All required parameters must be populated in order to send to server.
@@ -5778,7 +5777,7 @@ def __init__(self, *, key_name: str, **kwargs: Any) -> None:
         self.key_name = key_name
 
 
-class StorageAccountUpdateParameters(_serialization.Model):  # pylint: disable=too-many-instance-attributes
+class StorageAccountUpdateParameters(_serialization.Model):
     """The parameters that can be provided when updating the storage account properties.
 
     :ivar sku: Gets or sets the SKU name. Note that the SKU name cannot be updated to Standard_ZRS,
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/models/_storage_management_client_enums.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/models/_storage_management_client_enums.py
index d8de14ca8e0b..df99b9c4a414 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/models/_storage_management_client_enums.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/models/_storage_management_client_enums.py
@@ -230,6 +230,7 @@ class LeaseContainerRequestAction(str, Enum, metaclass=CaseInsensitiveEnumMeta):
     RENEW = "Renew"
     CHANGE = "Change"
     RELEASE = "Release"
+    BREAK = "Break"
     BREAK_ENUM = "Break"
 
 
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/operations/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/operations/__init__.py
index 0f201012e160..d406c5bf4d6b 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/operations/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/operations/__init__.py
@@ -5,29 +5,35 @@
 # 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 ._skus_operations import SkusOperations
-from ._storage_accounts_operations import StorageAccountsOperations
-from ._deleted_accounts_operations import DeletedAccountsOperations
-from ._usages_operations import UsagesOperations
-from ._management_policies_operations import ManagementPoliciesOperations
-from ._blob_inventory_policies_operations import BlobInventoryPoliciesOperations
-from ._private_endpoint_connections_operations import PrivateEndpointConnectionsOperations
-from ._private_link_resources_operations import PrivateLinkResourcesOperations
-from ._object_replication_policies_operations import ObjectReplicationPoliciesOperations
-from ._encryption_scopes_operations import EncryptionScopesOperations
-from ._blob_services_operations import BlobServicesOperations
-from ._blob_containers_operations import BlobContainersOperations
-from ._file_services_operations import FileServicesOperations
-from ._file_shares_operations import FileSharesOperations
-from ._queue_services_operations import QueueServicesOperations
-from ._queue_operations import QueueOperations
-from ._table_services_operations import TableServicesOperations
-from ._table_operations import TableOperations
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._operations import Operations  # type: ignore
+from ._skus_operations import SkusOperations  # type: ignore
+from ._storage_accounts_operations import StorageAccountsOperations  # type: ignore
+from ._deleted_accounts_operations import DeletedAccountsOperations  # type: ignore
+from ._usages_operations import UsagesOperations  # type: ignore
+from ._management_policies_operations import ManagementPoliciesOperations  # type: ignore
+from ._blob_inventory_policies_operations import BlobInventoryPoliciesOperations  # type: ignore
+from ._private_endpoint_connections_operations import PrivateEndpointConnectionsOperations  # type: ignore
+from ._private_link_resources_operations import PrivateLinkResourcesOperations  # type: ignore
+from ._object_replication_policies_operations import ObjectReplicationPoliciesOperations  # type: ignore
+from ._encryption_scopes_operations import EncryptionScopesOperations  # type: ignore
+from ._blob_services_operations import BlobServicesOperations  # type: ignore
+from ._blob_containers_operations import BlobContainersOperations  # type: ignore
+from ._file_services_operations import FileServicesOperations  # type: ignore
+from ._file_shares_operations import FileSharesOperations  # type: ignore
+from ._queue_services_operations import QueueServicesOperations  # type: ignore
+from ._queue_operations import QueueOperations  # type: ignore
+from ._table_services_operations import TableServicesOperations  # type: ignore
+from ._table_operations import TableOperations  # 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__ = [
@@ -51,5 +57,5 @@
     "TableServicesOperations",
     "TableOperations",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/operations/_blob_containers_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/operations/_blob_containers_operations.py
index a9d36d83cf1a..1d44218b5da1 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/operations/_blob_containers_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/operations/_blob_containers_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,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 (
@@ -21,20 +21,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -613,7 +611,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-01-01"))
         cls: ClsType[_models.ListContainerItems] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -635,7 +633,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -651,7 +648,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -786,7 +782,7 @@ def create(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -821,7 +817,6 @@ def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -835,11 +830,7 @@ def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("BlobContainer", pipeline_response)
-
-        if response.status_code == 201:
-            deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -949,7 +940,7 @@ def update(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -984,7 +975,6 @@ def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -998,7 +988,7 @@ def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1027,7 +1017,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1050,7 +1040,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1064,7 +1053,7 @@ def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1093,7 +1082,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,
@@ -1116,7 +1105,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1239,7 +1227,7 @@ def set_legal_hold(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.LegalHold
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1274,7 +1262,6 @@ def set_legal_hold(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1288,7 +1275,7 @@ def set_legal_hold(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LegalHold", pipeline_response)
+        deserialized = self._deserialize("LegalHold", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1398,7 +1385,7 @@ def clear_legal_hold(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.LegalHold
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1433,7 +1420,6 @@ def clear_legal_hold(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1447,7 +1433,7 @@ def clear_legal_hold(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LegalHold", pipeline_response)
+        deserialized = self._deserialize("LegalHold", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1586,7 +1572,7 @@ def create_or_update_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1626,7 +1612,6 @@ def create_or_update_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1643,7 +1628,7 @@ def create_or_update_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1686,7 +1671,7 @@ def get_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1711,7 +1696,6 @@ def get_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1728,7 +1712,7 @@ def get_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1773,7 +1757,7 @@ def delete_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1798,7 +1782,6 @@ def delete_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1815,7 +1798,7 @@ def delete_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1849,7 +1832,7 @@ def lock_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1873,7 +1856,6 @@ def lock_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1890,7 +1872,7 @@ def lock_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -2020,7 +2002,7 @@ def extend_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -2059,7 +2041,6 @@ def extend_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -2076,7 +2057,7 @@ def extend_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -2186,7 +2167,7 @@ def lease(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.LeaseContainerResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -2224,7 +2205,6 @@ def lease(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -2238,7 +2218,7 @@ def lease(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LeaseContainerResponse", pipeline_response)
+        deserialized = self._deserialize("LeaseContainerResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/operations/_blob_inventory_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/operations/_blob_inventory_policies_operations.py
index 37700c782cac..ed8a3c1c81fb 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/operations/_blob_inventory_policies_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/operations/_blob_inventory_policies_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 (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -235,7 +232,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.BlobInventoryPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -258,7 +255,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -273,7 +269,7 @@ def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response)
+        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -377,7 +373,7 @@ def create_or_update(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.BlobInventoryPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -412,7 +408,6 @@ def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -427,7 +422,7 @@ def create_or_update(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response)
+        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -459,7 +454,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,
@@ -482,7 +477,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -524,7 +518,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-01-01"))
         cls: ClsType[_models.ListBlobInventoryPolicy] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -543,7 +537,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -559,7 +552,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/operations/_blob_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/operations/_blob_services_operations.py
index 5f9382900792..5c0aa6aa13fd 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/operations/_blob_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/operations/_blob_services_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 (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -197,7 +194,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-01-01"))
         cls: ClsType[_models.BlobServiceItems] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -216,7 +213,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -232,7 +228,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -361,7 +356,7 @@ def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.BlobServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -396,7 +391,6 @@ def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -410,7 +404,7 @@ def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobServiceProperties", pipeline_response)
+        deserialized = self._deserialize("BlobServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -438,7 +432,7 @@ def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.BlobServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -461,7 +455,6 @@ def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -475,7 +468,7 @@ def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobServiceProperties", pipeline_response)
+        deserialized = self._deserialize("BlobServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/operations/_deleted_accounts_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/operations/_deleted_accounts_operations.py
index 43ded3c2f253..f96e8affdf41 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/operations/_deleted_accounts_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/operations/_deleted_accounts_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 (
@@ -20,20 +19,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -130,7 +127,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.DeletedAccount"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-01-01"))
         cls: ClsType[_models.DeletedAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -147,7 +144,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -163,7 +159,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -205,7 +200,7 @@ def get(self, deleted_account_name: str, location: str, **kwargs: Any) -> _model
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.DeletedAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -227,7 +222,6 @@ def get(self, deleted_account_name: str, location: str, **kwargs: Any) -> _model
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -242,7 +236,7 @@ def get(self, deleted_account_name: str, location: str, **kwargs: Any) -> _model
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("DeletedAccount", pipeline_response)
+        deserialized = self._deserialize("DeletedAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/operations/_encryption_scopes_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/operations/_encryption_scopes_operations.py
index d42dbf87a3ef..c3d69d24c531 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/operations/_encryption_scopes_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/operations/_encryption_scopes_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 (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -315,7 +312,7 @@ def put(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.EncryptionScope
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -350,7 +347,6 @@ def put(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -365,11 +361,7 @@ def put(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("EncryptionScope", pipeline_response)
-
-        if response.status_code == 201:
-            deserialized = self._deserialize("EncryptionScope", pipeline_response)
+        deserialized = self._deserialize("EncryptionScope", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -479,7 +471,7 @@ def patch(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.EncryptionScope
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -514,7 +506,6 @@ def patch(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -529,7 +520,7 @@ def patch(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("EncryptionScope", pipeline_response)
+        deserialized = self._deserialize("EncryptionScope", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -558,7 +549,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.EncryptionScope
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -581,7 +572,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -596,7 +586,7 @@ def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("EncryptionScope", pipeline_response)
+        deserialized = self._deserialize("EncryptionScope", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -624,7 +614,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> It
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-01-01"))
         cls: ClsType[_models.EncryptionScopeListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -643,7 +633,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -659,7 +648,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/operations/_file_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/operations/_file_services_operations.py
index 51e462a9630b..373cd552fa0b 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/operations/_file_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/operations/_file_services_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,
@@ -19,20 +18,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -185,7 +182,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.FileServiceItems
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -207,7 +204,6 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -221,7 +217,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileServiceItems", pipeline_response)
+        deserialized = self._deserialize("FileServiceItems", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -328,7 +324,7 @@ def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.FileServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -363,7 +359,6 @@ def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -377,7 +372,7 @@ def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileServiceProperties", pipeline_response)
+        deserialized = self._deserialize("FileServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -405,7 +400,7 @@ def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.FileServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -428,7 +423,6 @@ def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -442,7 +436,7 @@ def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileServiceProperties", pipeline_response)
+        deserialized = self._deserialize("FileServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/operations/_file_shares_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/operations/_file_shares_operations.py
index 3123c5bc3980..562b28b39c84 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/operations/_file_shares_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/operations/_file_shares_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,7 @@
 # --------------------------------------------------------------------------
 from io import IOBase
 import sys
-from typing import Any, Callable, Dict, IO, Iterable, Literal, Optional, Type, TypeVar, Union, overload
+from typing import Any, Callable, Dict, IO, Iterable, Literal, Optional, TypeVar, Union, overload
 import urllib.parse
 
 from azure.core.exceptions import (
@@ -21,20 +21,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -352,7 +350,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-01-01"))
         cls: ClsType[_models.FileShareItems] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -374,7 +372,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -390,7 +387,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -534,7 +530,7 @@ def create(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.FileShare
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -570,7 +566,6 @@ def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -584,11 +579,7 @@ def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("FileShare", pipeline_response)
-
-        if response.status_code == 201:
-            deserialized = self._deserialize("FileShare", pipeline_response)
+        deserialized = self._deserialize("FileShare", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -698,7 +689,7 @@ def update(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.FileShare
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -733,7 +724,6 @@ def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -747,7 +737,7 @@ def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileShare", pipeline_response)
+        deserialized = self._deserialize("FileShare", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -788,7 +778,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.FileShare
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -813,7 +803,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -827,7 +816,7 @@ def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileShare", pipeline_response)
+        deserialized = self._deserialize("FileShare", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -863,7 +852,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,
@@ -887,7 +876,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -905,7 +893,7 @@ def delete(  # pylint: disable=inconsistent-return-statements
             return cls(pipeline_response, None, {})  # type: ignore
 
     @overload
-    def restore(  # pylint: disable=inconsistent-return-statements
+    def restore(
         self,
         resource_group_name: str,
         account_name: str,
@@ -940,7 +928,7 @@ def restore(  # pylint: disable=inconsistent-return-statements
         """
 
     @overload
-    def restore(  # pylint: disable=inconsistent-return-statements
+    def restore(
         self,
         resource_group_name: str,
         account_name: str,
@@ -1003,7 +991,7 @@ def restore(  # 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,
@@ -1038,7 +1026,6 @@ def restore(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/operations/_management_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/operations/_management_policies_operations.py
index 36fbcc49df36..083c73181495 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/operations/_management_policies_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/operations/_management_policies_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,
@@ -19,20 +18,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -196,7 +193,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.ManagementPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -219,7 +216,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -233,7 +229,7 @@ def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ManagementPolicy", pipeline_response)
+        deserialized = self._deserialize("ManagementPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -337,7 +333,7 @@ def create_or_update(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.ManagementPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -372,7 +368,6 @@ def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -386,7 +381,7 @@ def create_or_update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ManagementPolicy", pipeline_response)
+        deserialized = self._deserialize("ManagementPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -418,7 +413,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,
@@ -441,7 +436,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/operations/_object_replication_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/operations/_object_replication_policies_operations.py
index ae1117ba832a..a0fa989091ef 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/operations/_object_replication_policies_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/operations/_object_replication_policies_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 (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -229,7 +226,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-01-01"))
         cls: ClsType[_models.ObjectReplicationPolicies] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -248,7 +245,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -264,7 +260,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -314,7 +309,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.ObjectReplicationPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -337,7 +332,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -352,7 +346,7 @@ def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response)
+        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -456,7 +450,7 @@ def create_or_update(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.ObjectReplicationPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -491,7 +485,6 @@ def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -506,7 +499,7 @@ def create_or_update(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response)
+        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -533,7 +526,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,
@@ -556,7 +549,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/operations/_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/operations/_operations.py
index 0e5554708307..2e6987a0d0eb 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/operations/_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/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 (
@@ -20,20 +19,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -94,7 +91,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.Operation"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-01-01"))
         cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -110,7 +107,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -126,7 +122,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/operations/_private_endpoint_connections_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/operations/_private_endpoint_connections_operations.py
index 584c4f597bef..fbb219521011 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/operations/_private_endpoint_connections_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/operations/_private_endpoint_connections_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 (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -241,7 +238,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-01-01"))
         cls: ClsType[_models.PrivateEndpointConnectionListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -260,7 +257,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -276,7 +272,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -325,7 +320,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.PrivateEndpointConnection
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -348,7 +343,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -363,7 +357,7 @@ def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response)
+        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -464,7 +458,7 @@ def put(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.PrivateEndpointConnection
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -499,7 +493,6 @@ def put(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -514,7 +507,7 @@ def put(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response)
+        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -541,7 +534,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,
@@ -564,7 +557,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/operations/_private_link_resources_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/operations/_private_link_resources_operations.py
index c9bf719d5e97..7e9a5ea1f692 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/operations/_private_link_resources_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/operations/_private_link_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, Optional, Type, TypeVar
+from typing import Any, Callable, Dict, Optional, TypeVar
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -18,20 +17,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -109,7 +106,7 @@ def list_by_storage_account(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.PrivateLinkResourceListResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -131,7 +128,6 @@ def list_by_storage_account(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -145,7 +141,7 @@ def list_by_storage_account(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("PrivateLinkResourceListResult", pipeline_response)
+        deserialized = self._deserialize("PrivateLinkResourceListResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/operations/_queue_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/operations/_queue_operations.py
index c55813666403..fb83fb205c5f 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/operations/_queue_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/operations/_queue_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 (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -375,7 +372,7 @@ def create(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.StorageQueue
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -410,7 +407,6 @@ def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -424,7 +420,7 @@ def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageQueue", pipeline_response)
+        deserialized = self._deserialize("StorageQueue", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -531,7 +527,7 @@ def update(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.StorageQueue
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -566,7 +562,6 @@ def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -580,7 +575,7 @@ def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageQueue", pipeline_response)
+        deserialized = self._deserialize("StorageQueue", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -607,7 +602,7 @@ def get(self, resource_group_name: str, account_name: str, queue_name: str, **kw
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.StorageQueue
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -630,7 +625,6 @@ def get(self, resource_group_name: str, account_name: str, queue_name: str, **kw
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -644,7 +638,7 @@ def get(self, resource_group_name: str, account_name: str, queue_name: str, **kw
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageQueue", pipeline_response)
+        deserialized = self._deserialize("StorageQueue", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -673,7 +667,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,
@@ -696,7 +690,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -747,7 +740,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-01-01"))
         cls: ClsType[_models.ListQueueResource] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -768,7 +761,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -784,7 +776,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/operations/_queue_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/operations/_queue_services_operations.py
index 2eb6cdf21048..0b9c3716f23f 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/operations/_queue_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/operations/_queue_services_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,
@@ -19,20 +18,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -185,7 +182,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.ListQueueServices
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -207,7 +204,6 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -221,7 +217,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListQueueServices", pipeline_response)
+        deserialized = self._deserialize("ListQueueServices", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -328,7 +324,7 @@ def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.QueueServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -363,7 +359,6 @@ def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -377,7 +372,7 @@ def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("QueueServiceProperties", pipeline_response)
+        deserialized = self._deserialize("QueueServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -405,7 +400,7 @@ def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.QueueServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -428,7 +423,6 @@ def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -442,7 +436,7 @@ def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("QueueServiceProperties", pipeline_response)
+        deserialized = self._deserialize("QueueServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/operations/_skus_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/operations/_skus_operations.py
index f7d361dcb2e9..c222a593455d 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/operations/_skus_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/operations/_skus_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 (
@@ -20,20 +19,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -99,7 +96,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.SkuInformation"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-01-01"))
         cls: ClsType[_models.StorageSkuListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -116,7 +113,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -132,7 +128,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/operations/_storage_accounts_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/operations/_storage_accounts_operations.py
index 8bc3da6703e6..dc2694e629eb 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/operations/_storage_accounts_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/operations/_storage_accounts_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,7 @@
 # --------------------------------------------------------------------------
 from io import IOBase
 import sys
-from typing import Any, Callable, Dict, IO, Iterable, Literal, Optional, Type, TypeVar, Union, cast, overload
+from typing import Any, Callable, Dict, IO, Iterable, Iterator, Literal, Optional, TypeVar, Union, cast, overload
 import urllib.parse
 
 from azure.core.exceptions import (
@@ -17,13 +17,14 @@
     ResourceExistsError,
     ResourceNotFoundError,
     ResourceNotModifiedError,
+    StreamClosedError,
+    StreamConsumedError,
     map_error,
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
 from azure.core.polling import LROPoller, NoPolling, PollingMethod
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
@@ -31,12 +32,11 @@
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -582,7 +582,7 @@ def check_name_availability(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.CheckNameAvailabilityResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -614,7 +614,6 @@ def check_name_availability(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -628,7 +627,7 @@ def check_name_availability(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response)
+        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -641,8 +640,8 @@ def _create_initial(
         account_name: str,
         parameters: Union[_models.StorageAccountCreateParameters, IO[bytes]],
         **kwargs: Any
-    ) -> Optional[_models.StorageAccount]:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> Iterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -655,7 +654,7 @@ def _create_initial(
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-01-01"))
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
-        cls: ClsType[Optional[_models.StorageAccount]] = kwargs.pop("cls", None)
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
         _json = None
@@ -676,10 +675,10 @@ def _create_initial(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -687,12 +686,14 @@ def _create_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = None
-        if response.status_code == 200:
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -815,10 +816,11 @@ def begin_create(
                 params=_params,
                 **kwargs
             )
+            raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+            deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
             if cls:
                 return cls(pipeline_response, deserialized, {})  # type: ignore
             return deserialized
@@ -857,7 +859,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,
@@ -879,7 +881,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -924,7 +925,7 @@ def get_properties(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -947,7 +948,6 @@ def get_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -961,7 +961,7 @@ def get_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1072,7 +1072,7 @@ def update(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1106,7 +1106,6 @@ def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1120,7 +1119,7 @@ def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1142,7 +1141,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.StorageAccount"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-01-01"))
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1159,7 +1158,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -1175,7 +1173,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -1222,7 +1219,7 @@ def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> Ite
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-01-01"))
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1240,7 +1237,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -1256,7 +1252,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -1306,7 +1301,7 @@ def list_keys(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.StorageAccountListKeysResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1329,7 +1324,6 @@ def list_keys(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1343,7 +1337,7 @@ def list_keys(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response)
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1437,7 +1431,7 @@ def regenerate_key(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.StorageAccountListKeysResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1471,7 +1465,6 @@ def regenerate_key(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1485,7 +1478,7 @@ def regenerate_key(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response)
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1576,7 +1569,7 @@ def list_account_sas(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.ListAccountSasResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1610,7 +1603,6 @@ def list_account_sas(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1624,7 +1616,7 @@ def list_account_sas(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListAccountSasResponse", pipeline_response)
+        deserialized = self._deserialize("ListAccountSasResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1713,7 +1705,7 @@ def list_service_sas(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.ListServiceSasResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1747,7 +1739,6 @@ def list_service_sas(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1761,17 +1752,15 @@ def list_service_sas(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListServiceSasResponse", pipeline_response)
+        deserialized = self._deserialize("ListServiceSasResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
 
         return deserialized  # type: ignore
 
-    def _failover_initial(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, **kwargs: Any
-    ) -> None:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    def _failover_initial(self, resource_group_name: str, account_name: str, **kwargs: Any) -> Iterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1783,7 +1772,7 @@ def _failover_initial(  # pylint: disable=inconsistent-return-statements
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-01-01"))
-        cls: ClsType[None] = kwargs.pop("cls", None)
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
 
         _request = build_failover_request(
             resource_group_name=resource_group_name,
@@ -1793,10 +1782,10 @@ def _failover_initial(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -1804,11 +1793,19 @@ def _failover_initial(  # pylint: disable=inconsistent-return-statements
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
-            return cls(pipeline_response, None, {})  # type: ignore
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
 
     @distributed_trace
     def begin_failover(self, resource_group_name: str, account_name: str, **kwargs: Any) -> LROPoller[None]:
@@ -1836,7 +1833,7 @@ def begin_failover(self, resource_group_name: str, account_name: str, **kwargs:
         lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
         cont_token: Optional[str] = kwargs.pop("continuation_token", None)
         if cont_token is None:
-            raw_result = self._failover_initial(  # type: ignore
+            raw_result = self._failover_initial(
                 resource_group_name=resource_group_name,
                 account_name=account_name,
                 api_version=api_version,
@@ -1845,6 +1842,7 @@ def begin_failover(self, resource_group_name: str, account_name: str, **kwargs:
                 params=_params,
                 **kwargs
             )
+            raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
@@ -1874,8 +1872,8 @@ def _restore_blob_ranges_initial(
         account_name: str,
         parameters: Union[_models.BlobRestoreParameters, IO[bytes]],
         **kwargs: Any
-    ) -> _models.BlobRestoreStatus:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> Iterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1888,7 +1886,7 @@ def _restore_blob_ranges_initial(
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-01-01"))
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
-        cls: ClsType[_models.BlobRestoreStatus] = kwargs.pop("cls", None)
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
         _json = None
@@ -1909,10 +1907,10 @@ def _restore_blob_ranges_initial(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -1920,14 +1918,14 @@ def _restore_blob_ranges_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response)
-
-        if response.status_code == 202:
-            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response)
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -2040,10 +2038,11 @@ def begin_restore_blob_ranges(
                 params=_params,
                 **kwargs
             )
+            raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):
-            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response)
+            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response.http_response)
             if cls:
                 return cls(pipeline_response, deserialized, {})  # type: ignore
             return deserialized
@@ -2084,7 +2083,7 @@ def revoke_user_delegation_keys(  # pylint: disable=inconsistent-return-statemen
         :rtype: None
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -2106,7 +2105,6 @@ def revoke_user_delegation_keys(  # pylint: disable=inconsistent-return-statemen
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/operations/_table_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/operations/_table_operations.py
index 958b2edaa6e7..85bed212ddd7 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/operations/_table_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/operations/_table_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 (
@@ -20,20 +19,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -255,7 +252,7 @@ def create(self, resource_group_name: str, account_name: str, table_name: str, *
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.Table
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -278,7 +275,6 @@ def create(self, resource_group_name: str, account_name: str, table_name: str, *
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -292,7 +288,7 @@ def create(self, resource_group_name: str, account_name: str, table_name: str, *
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("Table", pipeline_response)
+        deserialized = self._deserialize("Table", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -318,7 +314,7 @@ def update(self, resource_group_name: str, account_name: str, table_name: str, *
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.Table
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -341,7 +337,6 @@ def update(self, resource_group_name: str, account_name: str, table_name: str, *
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -355,7 +350,7 @@ def update(self, resource_group_name: str, account_name: str, table_name: str, *
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("Table", pipeline_response)
+        deserialized = self._deserialize("Table", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -381,7 +376,7 @@ def get(self, resource_group_name: str, account_name: str, table_name: str, **kw
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.Table
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -404,7 +399,6 @@ def get(self, resource_group_name: str, account_name: str, table_name: str, **kw
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -418,7 +412,7 @@ def get(self, resource_group_name: str, account_name: str, table_name: str, **kw
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("Table", pipeline_response)
+        deserialized = self._deserialize("Table", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -446,7 +440,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,
@@ -469,7 +463,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -507,7 +500,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> It
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-01-01"))
         cls: ClsType[_models.ListTableResource] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -526,7 +519,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -542,7 +534,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/operations/_table_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/operations/_table_services_operations.py
index 978d7df9771e..dffc87384e4f 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/operations/_table_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/operations/_table_services_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,
@@ -19,20 +18,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -185,7 +182,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.ListTableServices
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -207,7 +204,6 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -221,7 +217,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListTableServices", pipeline_response)
+        deserialized = self._deserialize("ListTableServices", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -328,7 +324,7 @@ def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.TableServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -363,7 +359,6 @@ def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -377,7 +372,7 @@ def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("TableServiceProperties", pipeline_response)
+        deserialized = self._deserialize("TableServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -405,7 +400,7 @@ def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_01_01.models.TableServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -428,7 +423,6 @@ def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -442,7 +436,7 @@ def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("TableServiceProperties", pipeline_response)
+        deserialized = self._deserialize("TableServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/operations/_usages_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/operations/_usages_operations.py
index 7b96f58461df..c6edc83d5009 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/operations/_usages_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_01_01/operations/_usages_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 (
@@ -20,20 +19,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -105,7 +102,7 @@ def list_by_location(self, location: str, **kwargs: Any) -> Iterable["_models.Us
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-01-01"))
         cls: ClsType[_models.UsageListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -123,7 +120,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -139,7 +135,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/__init__.py
index a860a5c185c9..60980065e1ee 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/__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 ._storage_management_client import StorageManagementClient
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._storage_management_client import StorageManagementClient  # 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__ = [
     "StorageManagementClient",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/_configuration.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/_configuration.py
index 81bea65fe510..ec4aedaa5b19 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/_configuration.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/_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 StorageManagementClientConfiguration:  # pylint: disable=too-many-instance-attributes,name-too-long
+class StorageManagementClientConfiguration:  # pylint: disable=too-many-instance-attributes
     """Configuration for StorageManagementClient.
 
     Note that all parameters used to create this instance are saved as instance
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/_metadata.json b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/_metadata.json
index 6cb872939b5a..21c0304058f5 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/_metadata.json
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/_metadata.json
@@ -10,8 +10,8 @@
         "azure_arm": true,
         "has_public_lro_operations": true,
         "client_side_validation": false,
-        "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"ARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementClientConfiguration\"], \".._serialization\": [\"Deserializer\", \"Serializer\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}}",
-        "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"AsyncARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"AsyncARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementClientConfiguration\"], \"..._serialization\": [\"Deserializer\", \"Serializer\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"]}}}"
+        "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"ARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementClientConfiguration\"], \".._serialization\": [\"Deserializer\", \"Serializer\"]}, \"stdlib\": {\"typing_extensions\": [\"Self\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}}",
+        "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"AsyncARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"AsyncARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementClientConfiguration\"], \"..._serialization\": [\"Deserializer\", \"Serializer\"]}, \"stdlib\": {\"typing_extensions\": [\"Self\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"]}}}"
     },
     "global_parameters": {
         "sync": {
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/_storage_management_client.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/_storage_management_client.py
index dac901a8114c..bf476f1c991a 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/_storage_management_client.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/_storage_management_client.py
@@ -8,6 +8,7 @@
 
 from copy import deepcopy
 from typing import Any, TYPE_CHECKING
+from typing_extensions import Self
 
 from azure.core.pipeline import policies
 from azure.core.rest import HttpRequest, HttpResponse
@@ -40,11 +41,10 @@
 )
 
 if TYPE_CHECKING:
-    # pylint: disable=unused-import,ungrouped-imports
     from azure.core.credentials import TokenCredential
 
 
-class StorageManagementClient:  # pylint: disable=client-accepts-api-version-keyword,too-many-instance-attributes
+class StorageManagementClient:  # pylint: disable=too-many-instance-attributes
     """The Azure Storage Management API.
 
     :ivar operations: Operations operations
@@ -211,7 +211,7 @@ def _send_request(self, request: HttpRequest, *, stream: bool = False, **kwargs:
     def close(self) -> None:
         self._client.close()
 
-    def __enter__(self) -> "StorageManagementClient":
+    def __enter__(self) -> Self:
         self._client.__enter__()
         return self
 
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/_vendor.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/_vendor.py
deleted file mode 100644
index 0dafe0e287ff..000000000000
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/_vendor.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# --------------------------------------------------------------------------
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License. See License.txt in the project root for license information.
-# Code generated by Microsoft (R) AutoRest Code Generator.
-# Changes may cause incorrect behavior and will be lost if the code is regenerated.
-# --------------------------------------------------------------------------
-
-from azure.core.pipeline.transport import HttpRequest
-
-
-def _convert_request(request, files=None):
-    data = request.content if not files else None
-    request = HttpRequest(method=request.method, url=request.url, headers=request.headers, data=data)
-    if files:
-        request.set_formdata_body(files)
-    return request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/_version.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/_version.py
index 5a163c0afedc..e5754a47ce68 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/_version.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/_version.py
@@ -6,4 +6,4 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-VERSION = "21.2.1"
\ No newline at end of file
+VERSION = "1.0.0b1"
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/__init__.py
index a5c3d2414cfd..ee2b940bd4fc 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/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 ._storage_management_client import StorageManagementClient
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._storage_management_client import StorageManagementClient  # 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__ = [
     "StorageManagementClient",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/_configuration.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/_configuration.py
index d3591c932148..1df2ea6fb189 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/_configuration.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/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 StorageManagementClientConfiguration:  # pylint: disable=too-many-instance-attributes,name-too-long
+class StorageManagementClientConfiguration:  # pylint: disable=too-many-instance-attributes
     """Configuration for StorageManagementClient.
 
     Note that all parameters used to create this instance are saved as instance
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/_storage_management_client.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/_storage_management_client.py
index f1171f15d2f8..b044fa1f0490 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/_storage_management_client.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/_storage_management_client.py
@@ -8,6 +8,7 @@
 
 from copy import deepcopy
 from typing import Any, Awaitable, TYPE_CHECKING
+from typing_extensions import Self
 
 from azure.core.pipeline import policies
 from azure.core.rest import AsyncHttpResponse, HttpRequest
@@ -40,11 +41,10 @@
 )
 
 if TYPE_CHECKING:
-    # pylint: disable=unused-import,ungrouped-imports
     from azure.core.credentials_async import AsyncTokenCredential
 
 
-class StorageManagementClient:  # pylint: disable=client-accepts-api-version-keyword,too-many-instance-attributes
+class StorageManagementClient:  # pylint: disable=too-many-instance-attributes
     """The Azure Storage Management API.
 
     :ivar operations: Operations operations
@@ -216,7 +216,7 @@ def _send_request(
     async def close(self) -> None:
         await self._client.close()
 
-    async def __aenter__(self) -> "StorageManagementClient":
+    async def __aenter__(self) -> Self:
         await self._client.__aenter__()
         return self
 
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/operations/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/operations/__init__.py
index 0f201012e160..d406c5bf4d6b 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/operations/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/operations/__init__.py
@@ -5,29 +5,35 @@
 # 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 ._skus_operations import SkusOperations
-from ._storage_accounts_operations import StorageAccountsOperations
-from ._deleted_accounts_operations import DeletedAccountsOperations
-from ._usages_operations import UsagesOperations
-from ._management_policies_operations import ManagementPoliciesOperations
-from ._blob_inventory_policies_operations import BlobInventoryPoliciesOperations
-from ._private_endpoint_connections_operations import PrivateEndpointConnectionsOperations
-from ._private_link_resources_operations import PrivateLinkResourcesOperations
-from ._object_replication_policies_operations import ObjectReplicationPoliciesOperations
-from ._encryption_scopes_operations import EncryptionScopesOperations
-from ._blob_services_operations import BlobServicesOperations
-from ._blob_containers_operations import BlobContainersOperations
-from ._file_services_operations import FileServicesOperations
-from ._file_shares_operations import FileSharesOperations
-from ._queue_services_operations import QueueServicesOperations
-from ._queue_operations import QueueOperations
-from ._table_services_operations import TableServicesOperations
-from ._table_operations import TableOperations
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._operations import Operations  # type: ignore
+from ._skus_operations import SkusOperations  # type: ignore
+from ._storage_accounts_operations import StorageAccountsOperations  # type: ignore
+from ._deleted_accounts_operations import DeletedAccountsOperations  # type: ignore
+from ._usages_operations import UsagesOperations  # type: ignore
+from ._management_policies_operations import ManagementPoliciesOperations  # type: ignore
+from ._blob_inventory_policies_operations import BlobInventoryPoliciesOperations  # type: ignore
+from ._private_endpoint_connections_operations import PrivateEndpointConnectionsOperations  # type: ignore
+from ._private_link_resources_operations import PrivateLinkResourcesOperations  # type: ignore
+from ._object_replication_policies_operations import ObjectReplicationPoliciesOperations  # type: ignore
+from ._encryption_scopes_operations import EncryptionScopesOperations  # type: ignore
+from ._blob_services_operations import BlobServicesOperations  # type: ignore
+from ._blob_containers_operations import BlobContainersOperations  # type: ignore
+from ._file_services_operations import FileServicesOperations  # type: ignore
+from ._file_shares_operations import FileSharesOperations  # type: ignore
+from ._queue_services_operations import QueueServicesOperations  # type: ignore
+from ._queue_operations import QueueOperations  # type: ignore
+from ._table_services_operations import TableServicesOperations  # type: ignore
+from ._table_operations import TableOperations  # 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__ = [
@@ -51,5 +57,5 @@
     "TableServicesOperations",
     "TableOperations",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/operations/_blob_containers_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/operations/_blob_containers_operations.py
index 56beba94f9e6..3d8031607160 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/operations/_blob_containers_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/operations/_blob_containers_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,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
@@ -21,15 +21,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._blob_containers_operations import (
     build_clear_legal_hold_request,
     build_create_or_update_immutability_policy_request,
@@ -49,7 +47,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]]
 
@@ -114,7 +112,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-02-01"))
         cls: ClsType[_models.ListContainerItems] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -136,7 +134,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -152,7 +149,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -287,7 +283,7 @@ async def create(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -322,7 +318,6 @@ async def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -336,11 +331,7 @@ async def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("BlobContainer", pipeline_response)
-
-        if response.status_code == 201:
-            deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -450,7 +441,7 @@ async def update(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -485,7 +476,6 @@ async def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -499,7 +489,7 @@ async def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -528,7 +518,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -551,7 +541,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -565,7 +554,7 @@ async def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -573,9 +562,7 @@ async def get(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, container_name: str, **kwargs: Any
-    ) -> None:
+    async def delete(self, resource_group_name: str, account_name: str, container_name: str, **kwargs: Any) -> None:
         """Deletes specified container under its account.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -594,7 +581,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,
@@ -617,7 +604,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -740,7 +726,7 @@ async def set_legal_hold(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.LegalHold
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -775,7 +761,6 @@ async def set_legal_hold(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -789,7 +774,7 @@ async def set_legal_hold(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LegalHold", pipeline_response)
+        deserialized = self._deserialize("LegalHold", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -899,7 +884,7 @@ async def clear_legal_hold(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.LegalHold
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -934,7 +919,6 @@ async def clear_legal_hold(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -948,7 +932,7 @@ async def clear_legal_hold(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LegalHold", pipeline_response)
+        deserialized = self._deserialize("LegalHold", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1087,7 +1071,7 @@ async def create_or_update_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1127,7 +1111,6 @@ async def create_or_update_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1144,7 +1127,7 @@ async def create_or_update_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1187,7 +1170,7 @@ async def get_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1212,7 +1195,6 @@ async def get_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1229,7 +1211,7 @@ async def get_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1274,7 +1256,7 @@ async def delete_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1299,7 +1281,6 @@ async def delete_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1316,7 +1297,7 @@ async def delete_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1350,7 +1331,7 @@ async def lock_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1374,7 +1355,6 @@ async def lock_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1391,7 +1371,7 @@ async def lock_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1521,7 +1501,7 @@ async def extend_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1560,7 +1540,6 @@ async def extend_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1577,7 +1556,7 @@ async def extend_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1687,7 +1666,7 @@ async def lease(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.LeaseContainerResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1725,7 +1704,6 @@ async def lease(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1739,7 +1717,7 @@ async def lease(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LeaseContainerResponse", pipeline_response)
+        deserialized = self._deserialize("LeaseContainerResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/operations/_blob_inventory_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/operations/_blob_inventory_policies_operations.py
index c616681ecf49..21ad33ac873b 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/operations/_blob_inventory_policies_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/operations/_blob_inventory_policies_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._blob_inventory_policies_operations import (
     build_create_or_update_request,
     build_delete_request,
@@ -40,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]]
 
@@ -90,7 +87,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.BlobInventoryPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -113,7 +110,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -128,7 +124,7 @@ async def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response)
+        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -232,7 +228,7 @@ async def create_or_update(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.BlobInventoryPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -267,7 +263,6 @@ async def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -282,7 +277,7 @@ async def create_or_update(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response)
+        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -290,7 +285,7 @@ async def create_or_update(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
+    async def delete(
         self,
         resource_group_name: str,
         account_name: str,
@@ -314,7 +309,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,
@@ -337,7 +332,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -379,7 +373,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-02-01"))
         cls: ClsType[_models.ListBlobInventoryPolicy] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -398,7 +392,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -414,7 +407,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/operations/_blob_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/operations/_blob_services_operations.py
index 7eb0bf76f502..db0f11111607 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/operations/_blob_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/operations/_blob_services_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._blob_services_operations import (
     build_get_service_properties_request,
     build_list_request,
@@ -39,7 +36,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 +86,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-02-01"))
         cls: ClsType[_models.BlobServiceItems] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -108,7 +105,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -124,7 +120,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -253,7 +248,7 @@ async def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.BlobServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -288,7 +283,6 @@ async def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -302,7 +296,7 @@ async def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobServiceProperties", pipeline_response)
+        deserialized = self._deserialize("BlobServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -330,7 +324,7 @@ async def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.BlobServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -353,7 +347,6 @@ async def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -367,7 +360,7 @@ async def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobServiceProperties", pipeline_response)
+        deserialized = self._deserialize("BlobServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/operations/_deleted_accounts_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/operations/_deleted_accounts_operations.py
index db12eda9dffe..faf54212caf6 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/operations/_deleted_accounts_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/operations/_deleted_accounts_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
@@ -20,21 +19,19 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._deleted_accounts_operations import build_get_request, build_list_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
 
@@ -74,7 +71,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.DeletedAccount"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-02-01"))
         cls: ClsType[_models.DeletedAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -91,7 +88,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -107,7 +103,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -149,7 +144,7 @@ async def get(self, deleted_account_name: str, location: str, **kwargs: Any) ->
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.DeletedAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -171,7 +166,6 @@ async def get(self, deleted_account_name: str, location: str, **kwargs: Any) ->
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -186,7 +180,7 @@ async def get(self, deleted_account_name: str, location: str, **kwargs: Any) ->
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("DeletedAccount", pipeline_response)
+        deserialized = self._deserialize("DeletedAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/operations/_encryption_scopes_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/operations/_encryption_scopes_operations.py
index 77e97c3c6f7e..3730e2a50e34 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/operations/_encryption_scopes_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/operations/_encryption_scopes_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._encryption_scopes_operations import (
     build_get_request,
     build_list_request,
@@ -40,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]]
 
@@ -173,7 +170,7 @@ async def put(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.EncryptionScope
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -208,7 +205,6 @@ async def put(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -223,11 +219,7 @@ async def put(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("EncryptionScope", pipeline_response)
-
-        if response.status_code == 201:
-            deserialized = self._deserialize("EncryptionScope", pipeline_response)
+        deserialized = self._deserialize("EncryptionScope", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -337,7 +329,7 @@ async def patch(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.EncryptionScope
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -372,7 +364,6 @@ async def patch(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -387,7 +378,7 @@ async def patch(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("EncryptionScope", pipeline_response)
+        deserialized = self._deserialize("EncryptionScope", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -416,7 +407,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.EncryptionScope
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -439,7 +430,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -454,7 +444,7 @@ async def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("EncryptionScope", pipeline_response)
+        deserialized = self._deserialize("EncryptionScope", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -485,7 +475,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-02-01"))
         cls: ClsType[_models.EncryptionScopeListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -504,7 +494,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -520,7 +509,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/operations/_file_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/operations/_file_services_operations.py
index 157848350567..6aee0d84cb40 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/operations/_file_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/operations/_file_services_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,
@@ -19,14 +18,12 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._file_services_operations import (
     build_get_service_properties_request,
     build_list_request,
@@ -36,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]]
 
@@ -76,7 +73,7 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.FileServiceItems
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -98,7 +95,6 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -112,7 +108,7 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileServiceItems", pipeline_response)
+        deserialized = self._deserialize("FileServiceItems", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -219,7 +215,7 @@ async def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.FileServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -254,7 +250,6 @@ async def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -268,7 +263,7 @@ async def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileServiceProperties", pipeline_response)
+        deserialized = self._deserialize("FileServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -296,7 +291,7 @@ async def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.FileServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -319,7 +314,6 @@ async def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -333,7 +327,7 @@ async def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileServiceProperties", pipeline_response)
+        deserialized = self._deserialize("FileServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/operations/_file_shares_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/operations/_file_shares_operations.py
index 4e7c1bb00549..19e904572a24 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/operations/_file_shares_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/operations/_file_shares_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, Literal, Optional, Type, TypeVar, Union, overload
+from typing import Any, AsyncIterable, Callable, Dict, IO, Literal, Optional, TypeVar, Union, overload
 import urllib.parse
 
 from azure.core.async_paging import AsyncItemPaged, AsyncList
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._file_shares_operations import (
     build_create_request,
     build_delete_request,
@@ -42,7 +39,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]]
 
@@ -106,7 +103,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-02-01"))
         cls: ClsType[_models.FileShareItems] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -128,7 +125,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -144,7 +140,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -288,7 +283,7 @@ async def create(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.FileShare
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -324,7 +319,6 @@ async def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -338,11 +332,7 @@ async def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("FileShare", pipeline_response)
-
-        if response.status_code == 201:
-            deserialized = self._deserialize("FileShare", pipeline_response)
+        deserialized = self._deserialize("FileShare", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -452,7 +442,7 @@ async def update(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.FileShare
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -487,7 +477,6 @@ async def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -501,7 +490,7 @@ async def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileShare", pipeline_response)
+        deserialized = self._deserialize("FileShare", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -542,7 +531,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.FileShare
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -567,7 +556,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -581,7 +569,7 @@ async def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileShare", pipeline_response)
+        deserialized = self._deserialize("FileShare", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -589,7 +577,7 @@ async def get(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
+    async def delete(
         self,
         resource_group_name: str,
         account_name: str,
@@ -617,7 +605,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,
@@ -641,7 +629,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -659,7 +646,7 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             return cls(pipeline_response, None, {})  # type: ignore
 
     @overload
-    async def restore(  # pylint: disable=inconsistent-return-statements
+    async def restore(
         self,
         resource_group_name: str,
         account_name: str,
@@ -694,7 +681,7 @@ async def restore(  # pylint: disable=inconsistent-return-statements
         """
 
     @overload
-    async def restore(  # pylint: disable=inconsistent-return-statements
+    async def restore(
         self,
         resource_group_name: str,
         account_name: str,
@@ -729,7 +716,7 @@ async def restore(  # pylint: disable=inconsistent-return-statements
         """
 
     @distributed_trace_async
-    async def restore(  # pylint: disable=inconsistent-return-statements
+    async def restore(
         self,
         resource_group_name: str,
         account_name: str,
@@ -757,7 +744,7 @@ async def restore(  # 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,
@@ -792,7 +779,6 @@ async def restore(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/operations/_management_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/operations/_management_policies_operations.py
index 416b1abc4c15..e4181bc26840 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/operations/_management_policies_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/operations/_management_policies_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,
@@ -19,14 +18,12 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._management_policies_operations import (
     build_create_or_update_request,
     build_delete_request,
@@ -36,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]]
 
@@ -86,7 +83,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.ManagementPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -109,7 +106,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -123,7 +119,7 @@ async def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ManagementPolicy", pipeline_response)
+        deserialized = self._deserialize("ManagementPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -227,7 +223,7 @@ async def create_or_update(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.ManagementPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -262,7 +258,6 @@ async def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -276,7 +271,7 @@ async def create_or_update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ManagementPolicy", pipeline_response)
+        deserialized = self._deserialize("ManagementPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -284,7 +279,7 @@ async def create_or_update(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
+    async def delete(
         self,
         resource_group_name: str,
         account_name: str,
@@ -308,7 +303,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,
@@ -331,7 +326,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/operations/_object_replication_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/operations/_object_replication_policies_operations.py
index 23f092418ebf..3648331fdfba 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/operations/_object_replication_policies_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/operations/_object_replication_policies_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._object_replication_policies_operations import (
     build_create_or_update_request,
     build_delete_request,
@@ -40,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]]
 
@@ -90,7 +87,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-02-01"))
         cls: ClsType[_models.ObjectReplicationPolicies] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -109,7 +106,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -125,7 +121,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -175,7 +170,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.ObjectReplicationPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -198,7 +193,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -213,7 +207,7 @@ async def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response)
+        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -317,7 +311,7 @@ async def create_or_update(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.ObjectReplicationPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -352,7 +346,6 @@ async def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -367,7 +360,7 @@ async def create_or_update(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response)
+        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -375,7 +368,7 @@ async def create_or_update(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
+    async def delete(
         self, resource_group_name: str, account_name: str, object_replication_policy_id: str, **kwargs: Any
     ) -> None:
         """Deletes the object replication policy associated with the specified storage account.
@@ -394,7 +387,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,
@@ -417,7 +410,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/operations/_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/operations/_operations.py
index 30c64363bc2d..2848ba3abf02 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/operations/_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/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
@@ -20,20 +19,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._operations import build_list_request
 
 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]]
 
@@ -73,7 +70,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.Operation"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-02-01"))
         cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -89,7 +86,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -105,7 +101,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/operations/_private_endpoint_connections_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/operations/_private_endpoint_connections_operations.py
index dbd72b159da8..15994dd7d444 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/operations/_private_endpoint_connections_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/operations/_private_endpoint_connections_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._private_endpoint_connections_operations import (
     build_delete_request,
     build_get_request,
@@ -40,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]]
 
@@ -90,7 +87,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-02-01"))
         cls: ClsType[_models.PrivateEndpointConnectionListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -109,7 +106,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -125,7 +121,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -174,7 +169,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.PrivateEndpointConnection
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -197,7 +192,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -212,7 +206,7 @@ async def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response)
+        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -313,7 +307,7 @@ async def put(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.PrivateEndpointConnection
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -348,7 +342,6 @@ async def put(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -363,7 +356,7 @@ async def put(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response)
+        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -371,7 +364,7 @@ async def put(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
+    async def delete(
         self, resource_group_name: str, account_name: str, private_endpoint_connection_name: str, **kwargs: Any
     ) -> None:
         """Deletes the specified private endpoint connection associated with the storage account.
@@ -390,7 +383,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,
@@ -413,7 +406,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/operations/_private_link_resources_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/operations/_private_link_resources_operations.py
index 7763354bb966..c4eb6dfbbb53 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/operations/_private_link_resources_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/operations/_private_link_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, Optional, Type, TypeVar
+from typing import Any, Callable, Dict, Optional, TypeVar
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -18,20 +17,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._private_link_resources_operations import build_list_by_storage_account_request
 
 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]]
 
@@ -73,7 +70,7 @@ async def list_by_storage_account(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.PrivateLinkResourceListResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -95,7 +92,6 @@ async def list_by_storage_account(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -109,7 +105,7 @@ async def list_by_storage_account(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("PrivateLinkResourceListResult", pipeline_response)
+        deserialized = self._deserialize("PrivateLinkResourceListResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/operations/_queue_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/operations/_queue_operations.py
index 4aab31d1795c..37699d8f0f41 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/operations/_queue_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/operations/_queue_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._queue_operations import (
     build_create_request,
     build_delete_request,
@@ -41,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]]
 
@@ -166,7 +163,7 @@ async def create(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.StorageQueue
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -201,7 +198,6 @@ async def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -215,7 +211,7 @@ async def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageQueue", pipeline_response)
+        deserialized = self._deserialize("StorageQueue", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -322,7 +318,7 @@ async def update(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.StorageQueue
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -357,7 +353,6 @@ async def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -371,7 +366,7 @@ async def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageQueue", pipeline_response)
+        deserialized = self._deserialize("StorageQueue", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -400,7 +395,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.StorageQueue
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -423,7 +418,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -437,7 +431,7 @@ async def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageQueue", pipeline_response)
+        deserialized = self._deserialize("StorageQueue", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -445,9 +439,7 @@ async def get(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, queue_name: str, **kwargs: Any
-    ) -> None:
+    async def delete(self, resource_group_name: str, account_name: str, queue_name: str, **kwargs: Any) -> None:
         """Deletes the queue with the specified queue name, under the specified account if it exists.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -466,7 +458,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,
@@ -489,7 +481,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -541,7 +532,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-02-01"))
         cls: ClsType[_models.ListQueueResource] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -562,7 +553,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -578,7 +568,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/operations/_queue_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/operations/_queue_services_operations.py
index 2d7d416eea7b..ed74cee205b0 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/operations/_queue_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/operations/_queue_services_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,
@@ -19,14 +18,12 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._queue_services_operations import (
     build_get_service_properties_request,
     build_list_request,
@@ -36,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]]
 
@@ -76,7 +73,7 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.ListQueueServices
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -98,7 +95,6 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -112,7 +108,7 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListQueueServices", pipeline_response)
+        deserialized = self._deserialize("ListQueueServices", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -219,7 +215,7 @@ async def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.QueueServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -254,7 +250,6 @@ async def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -268,7 +263,7 @@ async def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("QueueServiceProperties", pipeline_response)
+        deserialized = self._deserialize("QueueServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -296,7 +291,7 @@ async def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.QueueServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -319,7 +314,6 @@ async def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -333,7 +327,7 @@ async def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("QueueServiceProperties", pipeline_response)
+        deserialized = self._deserialize("QueueServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/operations/_skus_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/operations/_skus_operations.py
index 9b9056c0b91a..d0daac9ab5a5 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/operations/_skus_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/operations/_skus_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
@@ -20,20 +19,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._skus_operations import build_list_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
 
@@ -73,7 +70,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.SkuInformation"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-02-01"))
         cls: ClsType[_models.StorageSkuListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -90,7 +87,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -106,7 +102,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/operations/_storage_accounts_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/operations/_storage_accounts_operations.py
index c9f73b49e41f..ec2e78d690da 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/operations/_storage_accounts_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/operations/_storage_accounts_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,20 @@
 # --------------------------------------------------------------------------
 from io import IOBase
 import sys
-from typing import Any, AsyncIterable, Callable, Dict, IO, Literal, Optional, Type, TypeVar, Union, cast, overload
+from typing import (
+    Any,
+    AsyncIterable,
+    AsyncIterator,
+    Callable,
+    Dict,
+    IO,
+    Literal,
+    Optional,
+    TypeVar,
+    Union,
+    cast,
+    overload,
+)
 import urllib.parse
 
 from azure.core.async_paging import AsyncItemPaged, AsyncList
@@ -18,12 +31,13 @@
     ResourceExistsError,
     ResourceNotFoundError,
     ResourceNotModifiedError,
+    StreamClosedError,
+    StreamConsumedError,
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
 from azure.core.polling import AsyncLROPoller, AsyncNoPolling, AsyncPollingMethod
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
@@ -31,7 +45,6 @@
 from azure.mgmt.core.polling.async_arm_polling import AsyncARMPolling
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._storage_accounts_operations import (
     build_check_name_availability_request,
     build_create_request,
@@ -52,7 +65,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]]
 
@@ -135,7 +148,7 @@ async def check_name_availability(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.CheckNameAvailabilityResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -167,7 +180,6 @@ async def check_name_availability(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -181,7 +193,7 @@ async def check_name_availability(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response)
+        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -194,8 +206,8 @@ async def _create_initial(
         account_name: str,
         parameters: Union[_models.StorageAccountCreateParameters, IO[bytes]],
         **kwargs: Any
-    ) -> Optional[_models.StorageAccount]:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -208,7 +220,7 @@ async def _create_initial(
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-02-01"))
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
-        cls: ClsType[Optional[_models.StorageAccount]] = kwargs.pop("cls", None)
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
         _json = None
@@ -229,10 +241,10 @@ async def _create_initial(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -240,12 +252,14 @@ async def _create_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = None
-        if response.status_code == 200:
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -371,10 +385,11 @@ async def begin_create(
                 params=_params,
                 **kwargs
             )
+            await raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+            deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
             if cls:
                 return cls(pipeline_response, deserialized, {})  # type: ignore
             return deserialized
@@ -397,9 +412,7 @@ def get_long_running_output(pipeline_response):
         )
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, **kwargs: Any
-    ) -> None:
+    async def delete(self, resource_group_name: str, account_name: str, **kwargs: Any) -> None:
         """Deletes a storage account in Microsoft Azure.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -413,7 +426,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,
@@ -435,7 +448,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -480,7 +492,7 @@ async def get_properties(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -503,7 +515,6 @@ async def get_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -517,7 +528,7 @@ async def get_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -628,7 +639,7 @@ async def update(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -662,7 +673,6 @@ async def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -676,7 +686,7 @@ async def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -699,7 +709,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.StorageAccount"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-02-01"))
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -716,7 +726,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -732,7 +741,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -782,7 +790,7 @@ def list_by_resource_group(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-02-01"))
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -800,7 +808,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -816,7 +823,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -866,7 +872,7 @@ async def list_keys(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.StorageAccountListKeysResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -889,7 +895,6 @@ async def list_keys(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -903,7 +908,7 @@ async def list_keys(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response)
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -997,7 +1002,7 @@ async def regenerate_key(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.StorageAccountListKeysResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1031,7 +1036,6 @@ async def regenerate_key(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1045,7 +1049,7 @@ async def regenerate_key(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response)
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1136,7 +1140,7 @@ async def list_account_sas(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.ListAccountSasResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1170,7 +1174,6 @@ async def list_account_sas(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1184,7 +1187,7 @@ async def list_account_sas(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListAccountSasResponse", pipeline_response)
+        deserialized = self._deserialize("ListAccountSasResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1273,7 +1276,7 @@ async def list_service_sas(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.ListServiceSasResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1307,7 +1310,6 @@ async def list_service_sas(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1321,17 +1323,17 @@ async def list_service_sas(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListServiceSasResponse", pipeline_response)
+        deserialized = self._deserialize("ListServiceSasResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
 
         return deserialized  # type: ignore
 
-    async def _failover_initial(  # pylint: disable=inconsistent-return-statements
+    async def _failover_initial(
         self, resource_group_name: str, account_name: str, **kwargs: Any
-    ) -> None:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1343,7 +1345,7 @@ async def _failover_initial(  # pylint: disable=inconsistent-return-statements
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-02-01"))
-        cls: ClsType[None] = kwargs.pop("cls", None)
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
 
         _request = build_failover_request(
             resource_group_name=resource_group_name,
@@ -1353,10 +1355,10 @@ async def _failover_initial(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -1364,11 +1366,19 @@ async def _failover_initial(  # pylint: disable=inconsistent-return-statements
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
-            return cls(pipeline_response, None, {})  # type: ignore
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
 
     @distributed_trace_async
     async def begin_failover(self, resource_group_name: str, account_name: str, **kwargs: Any) -> AsyncLROPoller[None]:
@@ -1396,7 +1406,7 @@ async def begin_failover(self, resource_group_name: str, account_name: str, **kw
         lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
         cont_token: Optional[str] = kwargs.pop("continuation_token", None)
         if cont_token is None:
-            raw_result = await self._failover_initial(  # type: ignore
+            raw_result = await self._failover_initial(
                 resource_group_name=resource_group_name,
                 account_name=account_name,
                 api_version=api_version,
@@ -1405,6 +1415,7 @@ async def begin_failover(self, resource_group_name: str, account_name: str, **kw
                 params=_params,
                 **kwargs
             )
+            await raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
@@ -1434,8 +1445,8 @@ async def _restore_blob_ranges_initial(
         account_name: str,
         parameters: Union[_models.BlobRestoreParameters, IO[bytes]],
         **kwargs: Any
-    ) -> _models.BlobRestoreStatus:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1448,7 +1459,7 @@ async def _restore_blob_ranges_initial(
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-02-01"))
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
-        cls: ClsType[_models.BlobRestoreStatus] = kwargs.pop("cls", None)
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
         _json = None
@@ -1469,10 +1480,10 @@ async def _restore_blob_ranges_initial(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -1480,14 +1491,14 @@ async def _restore_blob_ranges_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response)
-
-        if response.status_code == 202:
-            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response)
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1603,10 +1614,11 @@ async def begin_restore_blob_ranges(
                 params=_params,
                 **kwargs
             )
+            await raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):
-            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response)
+            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response.http_response)
             if cls:
                 return cls(pipeline_response, deserialized, {})  # type: ignore
             return deserialized
@@ -1631,9 +1643,7 @@ def get_long_running_output(pipeline_response):
         )
 
     @distributed_trace_async
-    async def revoke_user_delegation_keys(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, **kwargs: Any
-    ) -> None:
+    async def revoke_user_delegation_keys(self, resource_group_name: str, account_name: str, **kwargs: Any) -> None:
         """Revoke user delegation keys.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -1647,7 +1657,7 @@ async def revoke_user_delegation_keys(  # pylint: disable=inconsistent-return-st
         :rtype: None
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1669,7 +1679,6 @@ async def revoke_user_delegation_keys(  # pylint: disable=inconsistent-return-st
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/operations/_table_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/operations/_table_operations.py
index 711d65a7ec89..1afc3b0be462 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/operations/_table_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/operations/_table_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
@@ -20,15 +19,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._table_operations import (
     build_create_request,
     build_delete_request,
@@ -40,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]]
 
@@ -86,7 +83,7 @@ async def create(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.Table
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -109,7 +106,6 @@ async def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -123,7 +119,7 @@ async def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("Table", pipeline_response)
+        deserialized = self._deserialize("Table", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -151,7 +147,7 @@ async def update(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.Table
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -174,7 +170,6 @@ async def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -188,7 +183,7 @@ async def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("Table", pipeline_response)
+        deserialized = self._deserialize("Table", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -214,7 +209,7 @@ async def get(self, resource_group_name: str, account_name: str, table_name: str
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.Table
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -237,7 +232,6 @@ async def get(self, resource_group_name: str, account_name: str, table_name: str
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -251,7 +245,7 @@ async def get(self, resource_group_name: str, account_name: str, table_name: str
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("Table", pipeline_response)
+        deserialized = self._deserialize("Table", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -259,9 +253,7 @@ async def get(self, resource_group_name: str, account_name: str, table_name: str
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, table_name: str, **kwargs: Any
-    ) -> None:
+    async def delete(self, resource_group_name: str, account_name: str, table_name: str, **kwargs: Any) -> None:
         """Deletes the table with the specified table name, under the specified account if it exists.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -279,7 +271,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,
@@ -302,7 +294,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -340,7 +331,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> As
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-02-01"))
         cls: ClsType[_models.ListTableResource] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -359,7 +350,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -375,7 +365,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/operations/_table_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/operations/_table_services_operations.py
index 9bfce4a6109c..37137965d9bc 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/operations/_table_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/operations/_table_services_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,
@@ -19,14 +18,12 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._table_services_operations import (
     build_get_service_properties_request,
     build_list_request,
@@ -36,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]]
 
@@ -76,7 +73,7 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.ListTableServices
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -98,7 +95,6 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -112,7 +108,7 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListTableServices", pipeline_response)
+        deserialized = self._deserialize("ListTableServices", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -219,7 +215,7 @@ async def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.TableServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -254,7 +250,6 @@ async def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -268,7 +263,7 @@ async def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("TableServiceProperties", pipeline_response)
+        deserialized = self._deserialize("TableServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -296,7 +291,7 @@ async def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.TableServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -319,7 +314,6 @@ async def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -333,7 +327,7 @@ async def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("TableServiceProperties", pipeline_response)
+        deserialized = self._deserialize("TableServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/operations/_usages_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/operations/_usages_operations.py
index ffd5e640defc..e27dded6811c 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/operations/_usages_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/aio/operations/_usages_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
@@ -20,20 +19,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._usages_operations import build_list_by_location_request
 
 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 +72,7 @@ def list_by_location(self, location: str, **kwargs: Any) -> AsyncIterable["_mode
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-02-01"))
         cls: ClsType[_models.UsageListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -93,7 +90,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -109,7 +105,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/models/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/models/__init__.py
index c418076aa34b..96e5d90182a4 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/models/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/models/__init__.py
@@ -5,196 +5,207 @@
 # 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 AccountSasParameters
-from ._models_py3 import ActiveDirectoryProperties
-from ._models_py3 import AzureEntityResource
-from ._models_py3 import AzureFilesIdentityBasedAuthentication
-from ._models_py3 import BlobContainer
-from ._models_py3 import BlobInventoryPolicy
-from ._models_py3 import BlobInventoryPolicyDefinition
-from ._models_py3 import BlobInventoryPolicyFilter
-from ._models_py3 import BlobInventoryPolicyRule
-from ._models_py3 import BlobInventoryPolicySchema
-from ._models_py3 import BlobRestoreParameters
-from ._models_py3 import BlobRestoreRange
-from ._models_py3 import BlobRestoreStatus
-from ._models_py3 import BlobServiceItems
-from ._models_py3 import BlobServiceProperties
-from ._models_py3 import ChangeFeed
-from ._models_py3 import CheckNameAvailabilityResult
-from ._models_py3 import CloudErrorBody
-from ._models_py3 import CorsRule
-from ._models_py3 import CorsRules
-from ._models_py3 import CustomDomain
-from ._models_py3 import DateAfterCreation
-from ._models_py3 import DateAfterModification
-from ._models_py3 import DeleteRetentionPolicy
-from ._models_py3 import DeletedAccount
-from ._models_py3 import DeletedAccountListResult
-from ._models_py3 import DeletedShare
-from ._models_py3 import Dimension
-from ._models_py3 import Encryption
-from ._models_py3 import EncryptionIdentity
-from ._models_py3 import EncryptionScope
-from ._models_py3 import EncryptionScopeKeyVaultProperties
-from ._models_py3 import EncryptionScopeListResult
-from ._models_py3 import EncryptionService
-from ._models_py3 import EncryptionServices
-from ._models_py3 import Endpoints
-from ._models_py3 import ErrorResponse
-from ._models_py3 import ErrorResponseBody
-from ._models_py3 import ExtendedLocation
-from ._models_py3 import FileServiceItems
-from ._models_py3 import FileServiceProperties
-from ._models_py3 import FileShare
-from ._models_py3 import FileShareItem
-from ._models_py3 import FileShareItems
-from ._models_py3 import GeoReplicationStats
-from ._models_py3 import IPRule
-from ._models_py3 import Identity
-from ._models_py3 import ImmutabilityPolicy
-from ._models_py3 import ImmutabilityPolicyProperties
-from ._models_py3 import KeyCreationTime
-from ._models_py3 import KeyPolicy
-from ._models_py3 import KeyVaultProperties
-from ._models_py3 import LastAccessTimeTrackingPolicy
-from ._models_py3 import LeaseContainerRequest
-from ._models_py3 import LeaseContainerResponse
-from ._models_py3 import LegalHold
-from ._models_py3 import LegalHoldProperties
-from ._models_py3 import ListAccountSasResponse
-from ._models_py3 import ListBlobInventoryPolicy
-from ._models_py3 import ListContainerItem
-from ._models_py3 import ListContainerItems
-from ._models_py3 import ListQueue
-from ._models_py3 import ListQueueResource
-from ._models_py3 import ListQueueServices
-from ._models_py3 import ListServiceSasResponse
-from ._models_py3 import ListTableResource
-from ._models_py3 import ListTableServices
-from ._models_py3 import ManagementPolicy
-from ._models_py3 import ManagementPolicyAction
-from ._models_py3 import ManagementPolicyBaseBlob
-from ._models_py3 import ManagementPolicyDefinition
-from ._models_py3 import ManagementPolicyFilter
-from ._models_py3 import ManagementPolicyRule
-from ._models_py3 import ManagementPolicySchema
-from ._models_py3 import ManagementPolicySnapShot
-from ._models_py3 import ManagementPolicyVersion
-from ._models_py3 import MetricSpecification
-from ._models_py3 import Multichannel
-from ._models_py3 import NetworkRuleSet
-from ._models_py3 import ObjectReplicationPolicies
-from ._models_py3 import ObjectReplicationPolicy
-from ._models_py3 import ObjectReplicationPolicyFilter
-from ._models_py3 import ObjectReplicationPolicyRule
-from ._models_py3 import Operation
-from ._models_py3 import OperationDisplay
-from ._models_py3 import OperationListResult
-from ._models_py3 import PrivateEndpoint
-from ._models_py3 import PrivateEndpointConnection
-from ._models_py3 import PrivateEndpointConnectionListResult
-from ._models_py3 import PrivateLinkResource
-from ._models_py3 import PrivateLinkResourceListResult
-from ._models_py3 import PrivateLinkServiceConnectionState
-from ._models_py3 import ProtocolSettings
-from ._models_py3 import ProxyResource
-from ._models_py3 import QueueServiceProperties
-from ._models_py3 import Resource
-from ._models_py3 import ResourceAccessRule
-from ._models_py3 import RestorePolicyProperties
-from ._models_py3 import Restriction
-from ._models_py3 import RoutingPreference
-from ._models_py3 import SKUCapability
-from ._models_py3 import SasPolicy
-from ._models_py3 import ServiceSasParameters
-from ._models_py3 import ServiceSpecification
-from ._models_py3 import Sku
-from ._models_py3 import SkuInformation
-from ._models_py3 import SmbSetting
-from ._models_py3 import StorageAccount
-from ._models_py3 import StorageAccountCheckNameAvailabilityParameters
-from ._models_py3 import StorageAccountCreateParameters
-from ._models_py3 import StorageAccountInternetEndpoints
-from ._models_py3 import StorageAccountKey
-from ._models_py3 import StorageAccountListKeysResult
-from ._models_py3 import StorageAccountListResult
-from ._models_py3 import StorageAccountMicrosoftEndpoints
-from ._models_py3 import StorageAccountRegenerateKeyParameters
-from ._models_py3 import StorageAccountUpdateParameters
-from ._models_py3 import StorageQueue
-from ._models_py3 import StorageSkuListResult
-from ._models_py3 import SystemData
-from ._models_py3 import Table
-from ._models_py3 import TableServiceProperties
-from ._models_py3 import TagFilter
-from ._models_py3 import TagProperty
-from ._models_py3 import TrackedResource
-from ._models_py3 import UpdateHistoryProperty
-from ._models_py3 import Usage
-from ._models_py3 import UsageListResult
-from ._models_py3 import UsageName
-from ._models_py3 import UserAssignedIdentity
-from ._models_py3 import VirtualNetworkRule
+from typing import TYPE_CHECKING
 
-from ._storage_management_client_enums import AccessTier
-from ._storage_management_client_enums import AccountStatus
-from ._storage_management_client_enums import BlobInventoryPolicyName
-from ._storage_management_client_enums import BlobRestoreProgressStatus
-from ._storage_management_client_enums import Bypass
-from ._storage_management_client_enums import CorsRuleAllowedMethodsItem
-from ._storage_management_client_enums import CreatedByType
-from ._storage_management_client_enums import DefaultAction
-from ._storage_management_client_enums import DirectoryServiceOptions
-from ._storage_management_client_enums import EnabledProtocols
-from ._storage_management_client_enums import EncryptionScopeSource
-from ._storage_management_client_enums import EncryptionScopeState
-from ._storage_management_client_enums import Enum31
-from ._storage_management_client_enums import ExpirationAction
-from ._storage_management_client_enums import ExtendedLocationTypes
-from ._storage_management_client_enums import GeoReplicationStatus
-from ._storage_management_client_enums import HttpProtocol
-from ._storage_management_client_enums import IdentityType
-from ._storage_management_client_enums import ImmutabilityPolicyState
-from ._storage_management_client_enums import ImmutabilityPolicyUpdateType
-from ._storage_management_client_enums import InventoryRuleType
-from ._storage_management_client_enums import KeyPermission
-from ._storage_management_client_enums import KeySource
-from ._storage_management_client_enums import KeyType
-from ._storage_management_client_enums import Kind
-from ._storage_management_client_enums import LargeFileSharesState
-from ._storage_management_client_enums import LeaseContainerRequestAction
-from ._storage_management_client_enums import LeaseDuration
-from ._storage_management_client_enums import LeaseState
-from ._storage_management_client_enums import LeaseStatus
-from ._storage_management_client_enums import ListContainersInclude
-from ._storage_management_client_enums import ListSharesExpand
-from ._storage_management_client_enums import ManagementPolicyName
-from ._storage_management_client_enums import MinimumTlsVersion
-from ._storage_management_client_enums import Name
-from ._storage_management_client_enums import Permissions
-from ._storage_management_client_enums import PrivateEndpointConnectionProvisioningState
-from ._storage_management_client_enums import PrivateEndpointServiceConnectionStatus
-from ._storage_management_client_enums import ProvisioningState
-from ._storage_management_client_enums import PublicAccess
-from ._storage_management_client_enums import PutSharesExpand
-from ._storage_management_client_enums import Reason
-from ._storage_management_client_enums import ReasonCode
-from ._storage_management_client_enums import RootSquashType
-from ._storage_management_client_enums import RoutingChoice
-from ._storage_management_client_enums import RuleType
-from ._storage_management_client_enums import Services
-from ._storage_management_client_enums import ShareAccessTier
-from ._storage_management_client_enums import SignedResource
-from ._storage_management_client_enums import SignedResourceTypes
-from ._storage_management_client_enums import SkuName
-from ._storage_management_client_enums import SkuTier
-from ._storage_management_client_enums import State
-from ._storage_management_client_enums import StorageAccountExpand
-from ._storage_management_client_enums import UsageUnit
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+
+from ._models_py3 import (  # type: ignore
+    AccountSasParameters,
+    ActiveDirectoryProperties,
+    AzureEntityResource,
+    AzureFilesIdentityBasedAuthentication,
+    BlobContainer,
+    BlobInventoryPolicy,
+    BlobInventoryPolicyDefinition,
+    BlobInventoryPolicyFilter,
+    BlobInventoryPolicyRule,
+    BlobInventoryPolicySchema,
+    BlobRestoreParameters,
+    BlobRestoreRange,
+    BlobRestoreStatus,
+    BlobServiceItems,
+    BlobServiceProperties,
+    ChangeFeed,
+    CheckNameAvailabilityResult,
+    CloudErrorBody,
+    CorsRule,
+    CorsRules,
+    CustomDomain,
+    DateAfterCreation,
+    DateAfterModification,
+    DeleteRetentionPolicy,
+    DeletedAccount,
+    DeletedAccountListResult,
+    DeletedShare,
+    Dimension,
+    Encryption,
+    EncryptionIdentity,
+    EncryptionScope,
+    EncryptionScopeKeyVaultProperties,
+    EncryptionScopeListResult,
+    EncryptionService,
+    EncryptionServices,
+    Endpoints,
+    ErrorResponse,
+    ErrorResponseBody,
+    ExtendedLocation,
+    FileServiceItems,
+    FileServiceProperties,
+    FileShare,
+    FileShareItem,
+    FileShareItems,
+    GeoReplicationStats,
+    IPRule,
+    Identity,
+    ImmutabilityPolicy,
+    ImmutabilityPolicyProperties,
+    KeyCreationTime,
+    KeyPolicy,
+    KeyVaultProperties,
+    LastAccessTimeTrackingPolicy,
+    LeaseContainerRequest,
+    LeaseContainerResponse,
+    LegalHold,
+    LegalHoldProperties,
+    ListAccountSasResponse,
+    ListBlobInventoryPolicy,
+    ListContainerItem,
+    ListContainerItems,
+    ListQueue,
+    ListQueueResource,
+    ListQueueServices,
+    ListServiceSasResponse,
+    ListTableResource,
+    ListTableServices,
+    ManagementPolicy,
+    ManagementPolicyAction,
+    ManagementPolicyBaseBlob,
+    ManagementPolicyDefinition,
+    ManagementPolicyFilter,
+    ManagementPolicyRule,
+    ManagementPolicySchema,
+    ManagementPolicySnapShot,
+    ManagementPolicyVersion,
+    MetricSpecification,
+    Multichannel,
+    NetworkRuleSet,
+    ObjectReplicationPolicies,
+    ObjectReplicationPolicy,
+    ObjectReplicationPolicyFilter,
+    ObjectReplicationPolicyRule,
+    Operation,
+    OperationDisplay,
+    OperationListResult,
+    PrivateEndpoint,
+    PrivateEndpointConnection,
+    PrivateEndpointConnectionListResult,
+    PrivateLinkResource,
+    PrivateLinkResourceListResult,
+    PrivateLinkServiceConnectionState,
+    ProtocolSettings,
+    ProxyResource,
+    QueueServiceProperties,
+    Resource,
+    ResourceAccessRule,
+    RestorePolicyProperties,
+    Restriction,
+    RoutingPreference,
+    SKUCapability,
+    SasPolicy,
+    ServiceSasParameters,
+    ServiceSpecification,
+    Sku,
+    SkuInformation,
+    SmbSetting,
+    StorageAccount,
+    StorageAccountCheckNameAvailabilityParameters,
+    StorageAccountCreateParameters,
+    StorageAccountInternetEndpoints,
+    StorageAccountKey,
+    StorageAccountListKeysResult,
+    StorageAccountListResult,
+    StorageAccountMicrosoftEndpoints,
+    StorageAccountRegenerateKeyParameters,
+    StorageAccountUpdateParameters,
+    StorageQueue,
+    StorageSkuListResult,
+    SystemData,
+    Table,
+    TableServiceProperties,
+    TagFilter,
+    TagProperty,
+    TrackedResource,
+    UpdateHistoryProperty,
+    Usage,
+    UsageListResult,
+    UsageName,
+    UserAssignedIdentity,
+    VirtualNetworkRule,
+)
+
+from ._storage_management_client_enums import (  # type: ignore
+    AccessTier,
+    AccountStatus,
+    BlobInventoryPolicyName,
+    BlobRestoreProgressStatus,
+    Bypass,
+    CorsRuleAllowedMethodsItem,
+    CreatedByType,
+    DefaultAction,
+    DirectoryServiceOptions,
+    EnabledProtocols,
+    EncryptionScopeSource,
+    EncryptionScopeState,
+    Enum31,
+    ExpirationAction,
+    ExtendedLocationTypes,
+    GeoReplicationStatus,
+    HttpProtocol,
+    IdentityType,
+    ImmutabilityPolicyState,
+    ImmutabilityPolicyUpdateType,
+    InventoryRuleType,
+    KeyPermission,
+    KeySource,
+    KeyType,
+    Kind,
+    LargeFileSharesState,
+    LeaseContainerRequestAction,
+    LeaseDuration,
+    LeaseState,
+    LeaseStatus,
+    ListContainersInclude,
+    ListSharesExpand,
+    ManagementPolicyName,
+    MinimumTlsVersion,
+    Name,
+    Permissions,
+    PrivateEndpointConnectionProvisioningState,
+    PrivateEndpointServiceConnectionStatus,
+    ProvisioningState,
+    PublicAccess,
+    PutSharesExpand,
+    Reason,
+    ReasonCode,
+    RootSquashType,
+    RoutingChoice,
+    RuleType,
+    Services,
+    ShareAccessTier,
+    SignedResource,
+    SignedResourceTypes,
+    SkuName,
+    SkuTier,
+    State,
+    StorageAccountExpand,
+    UsageUnit,
+)
 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__ = [
@@ -385,5 +396,5 @@
     "StorageAccountExpand",
     "UsageUnit",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/models/_models_py3.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/models/_models_py3.py
index 30a95af8e0ae..fe173ac44350 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/models/_models_py3.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/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
 
 
@@ -309,7 +308,7 @@ def __init__(
         self.active_directory_properties = active_directory_properties
 
 
-class BlobContainer(AzureEntityResource):  # pylint: disable=too-many-instance-attributes
+class BlobContainer(AzureEntityResource):
     """Properties of the blob container, including Id, resource name, resource type, Etag.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -819,7 +818,7 @@ def __init__(self, **kwargs: Any) -> None:
         self.value = None
 
 
-class BlobServiceProperties(Resource):  # pylint: disable=too-many-instance-attributes
+class BlobServiceProperties(Resource):
     """The properties of a storage account’s Blob service.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -2063,7 +2062,7 @@ def __init__(
         self.protocol_settings = protocol_settings
 
 
-class FileShare(AzureEntityResource):  # pylint: disable=too-many-instance-attributes
+class FileShare(AzureEntityResource):
     """Properties of the file share, including Id, resource name, resource type, Etag.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -2197,7 +2196,7 @@ def __init__(
         self.snapshot_time = None
 
 
-class FileShareItem(AzureEntityResource):  # pylint: disable=too-many-instance-attributes
+class FileShareItem(AzureEntityResource):
     """The file share properties be listed out.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -2811,7 +2810,7 @@ class LeaseContainerRequest(_serialization.Model):
     All required parameters must be populated in order to send to server.
 
     :ivar action: Specifies the lease action. Can be one of the available actions. Required. Known
-     values are: "Acquire", "Renew", "Change", "Release", and "Break".
+     values are: "Acquire", "Renew", "Change", "Release", "Break", and "Break".
     :vartype action: str or ~azure.mgmt.storage.v2021_02_01.models.LeaseContainerRequestAction
     :ivar lease_id: Identifies the lease. Can be specified in any valid GUID string format.
     :vartype lease_id: str
@@ -2850,7 +2849,7 @@ def __init__(
     ) -> None:
         """
         :keyword action: Specifies the lease action. Can be one of the available actions. Required.
-         Known values are: "Acquire", "Renew", "Change", "Release", and "Break".
+         Known values are: "Acquire", "Renew", "Change", "Release", "Break", and "Break".
         :paramtype action: str or ~azure.mgmt.storage.v2021_02_01.models.LeaseContainerRequestAction
         :keyword lease_id: Identifies the lease. Can be specified in any valid GUID string format.
         :paramtype lease_id: str
@@ -3019,7 +3018,7 @@ def __init__(self, **kwargs: Any) -> None:
         self.value = None
 
 
-class ListContainerItem(AzureEntityResource):  # pylint: disable=too-many-instance-attributes
+class ListContainerItem(AzureEntityResource):
     """The blob container properties be listed out.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -4704,7 +4703,7 @@ def __init__(
         self.expiration_action = expiration_action
 
 
-class ServiceSasParameters(_serialization.Model):  # pylint: disable=too-many-instance-attributes
+class ServiceSasParameters(_serialization.Model):
     """The parameters to list service SAS credentials of a specific resource.
 
     All required parameters must be populated in order to send to server.
@@ -5150,7 +5149,7 @@ def __init__(self, *, location: str, tags: Optional[Dict[str, str]] = None, **kw
         self.location = location
 
 
-class StorageAccount(TrackedResource):  # pylint: disable=too-many-instance-attributes
+class StorageAccount(TrackedResource):
     """The storage account.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -5471,7 +5470,7 @@ def __init__(self, *, name: str, **kwargs: Any) -> None:
         self.name = name
 
 
-class StorageAccountCreateParameters(_serialization.Model):  # pylint: disable=too-many-instance-attributes
+class StorageAccountCreateParameters(_serialization.Model):
     """The parameters used when creating a storage account.
 
     All required parameters must be populated in order to send to server.
@@ -5905,7 +5904,7 @@ def __init__(self, *, key_name: str, **kwargs: Any) -> None:
         self.key_name = key_name
 
 
-class StorageAccountUpdateParameters(_serialization.Model):  # pylint: disable=too-many-instance-attributes
+class StorageAccountUpdateParameters(_serialization.Model):
     """The parameters that can be provided when updating the storage account properties.
 
     :ivar sku: Gets or sets the SKU name. Note that the SKU name cannot be updated to Standard_ZRS,
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/models/_storage_management_client_enums.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/models/_storage_management_client_enums.py
index c8f6f588af5e..b8d266217924 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/models/_storage_management_client_enums.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/models/_storage_management_client_enums.py
@@ -236,6 +236,7 @@ class LeaseContainerRequestAction(str, Enum, metaclass=CaseInsensitiveEnumMeta):
     RENEW = "Renew"
     CHANGE = "Change"
     RELEASE = "Release"
+    BREAK = "Break"
     BREAK_ENUM = "Break"
 
 
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/operations/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/operations/__init__.py
index 0f201012e160..d406c5bf4d6b 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/operations/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/operations/__init__.py
@@ -5,29 +5,35 @@
 # 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 ._skus_operations import SkusOperations
-from ._storage_accounts_operations import StorageAccountsOperations
-from ._deleted_accounts_operations import DeletedAccountsOperations
-from ._usages_operations import UsagesOperations
-from ._management_policies_operations import ManagementPoliciesOperations
-from ._blob_inventory_policies_operations import BlobInventoryPoliciesOperations
-from ._private_endpoint_connections_operations import PrivateEndpointConnectionsOperations
-from ._private_link_resources_operations import PrivateLinkResourcesOperations
-from ._object_replication_policies_operations import ObjectReplicationPoliciesOperations
-from ._encryption_scopes_operations import EncryptionScopesOperations
-from ._blob_services_operations import BlobServicesOperations
-from ._blob_containers_operations import BlobContainersOperations
-from ._file_services_operations import FileServicesOperations
-from ._file_shares_operations import FileSharesOperations
-from ._queue_services_operations import QueueServicesOperations
-from ._queue_operations import QueueOperations
-from ._table_services_operations import TableServicesOperations
-from ._table_operations import TableOperations
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._operations import Operations  # type: ignore
+from ._skus_operations import SkusOperations  # type: ignore
+from ._storage_accounts_operations import StorageAccountsOperations  # type: ignore
+from ._deleted_accounts_operations import DeletedAccountsOperations  # type: ignore
+from ._usages_operations import UsagesOperations  # type: ignore
+from ._management_policies_operations import ManagementPoliciesOperations  # type: ignore
+from ._blob_inventory_policies_operations import BlobInventoryPoliciesOperations  # type: ignore
+from ._private_endpoint_connections_operations import PrivateEndpointConnectionsOperations  # type: ignore
+from ._private_link_resources_operations import PrivateLinkResourcesOperations  # type: ignore
+from ._object_replication_policies_operations import ObjectReplicationPoliciesOperations  # type: ignore
+from ._encryption_scopes_operations import EncryptionScopesOperations  # type: ignore
+from ._blob_services_operations import BlobServicesOperations  # type: ignore
+from ._blob_containers_operations import BlobContainersOperations  # type: ignore
+from ._file_services_operations import FileServicesOperations  # type: ignore
+from ._file_shares_operations import FileSharesOperations  # type: ignore
+from ._queue_services_operations import QueueServicesOperations  # type: ignore
+from ._queue_operations import QueueOperations  # type: ignore
+from ._table_services_operations import TableServicesOperations  # type: ignore
+from ._table_operations import TableOperations  # 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__ = [
@@ -51,5 +57,5 @@
     "TableServicesOperations",
     "TableOperations",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/operations/_blob_containers_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/operations/_blob_containers_operations.py
index 4fea134b9ee6..982198e41a69 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/operations/_blob_containers_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/operations/_blob_containers_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,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 (
@@ -21,20 +21,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -613,7 +611,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-02-01"))
         cls: ClsType[_models.ListContainerItems] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -635,7 +633,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -651,7 +648,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -786,7 +782,7 @@ def create(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -821,7 +817,6 @@ def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -835,11 +830,7 @@ def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("BlobContainer", pipeline_response)
-
-        if response.status_code == 201:
-            deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -949,7 +940,7 @@ def update(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -984,7 +975,6 @@ def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -998,7 +988,7 @@ def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1027,7 +1017,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1050,7 +1040,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1064,7 +1053,7 @@ def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1093,7 +1082,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,
@@ -1116,7 +1105,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1239,7 +1227,7 @@ def set_legal_hold(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.LegalHold
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1274,7 +1262,6 @@ def set_legal_hold(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1288,7 +1275,7 @@ def set_legal_hold(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LegalHold", pipeline_response)
+        deserialized = self._deserialize("LegalHold", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1398,7 +1385,7 @@ def clear_legal_hold(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.LegalHold
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1433,7 +1420,6 @@ def clear_legal_hold(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1447,7 +1433,7 @@ def clear_legal_hold(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LegalHold", pipeline_response)
+        deserialized = self._deserialize("LegalHold", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1586,7 +1572,7 @@ def create_or_update_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1626,7 +1612,6 @@ def create_or_update_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1643,7 +1628,7 @@ def create_or_update_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1686,7 +1671,7 @@ def get_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1711,7 +1696,6 @@ def get_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1728,7 +1712,7 @@ def get_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1773,7 +1757,7 @@ def delete_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1798,7 +1782,6 @@ def delete_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1815,7 +1798,7 @@ def delete_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1849,7 +1832,7 @@ def lock_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1873,7 +1856,6 @@ def lock_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1890,7 +1872,7 @@ def lock_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -2020,7 +2002,7 @@ def extend_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -2059,7 +2041,6 @@ def extend_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -2076,7 +2057,7 @@ def extend_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -2186,7 +2167,7 @@ def lease(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.LeaseContainerResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -2224,7 +2205,6 @@ def lease(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -2238,7 +2218,7 @@ def lease(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LeaseContainerResponse", pipeline_response)
+        deserialized = self._deserialize("LeaseContainerResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/operations/_blob_inventory_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/operations/_blob_inventory_policies_operations.py
index 033ac8fd81c5..eaff2150c43a 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/operations/_blob_inventory_policies_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/operations/_blob_inventory_policies_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 (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -235,7 +232,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.BlobInventoryPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -258,7 +255,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -273,7 +269,7 @@ def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response)
+        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -377,7 +373,7 @@ def create_or_update(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.BlobInventoryPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -412,7 +408,6 @@ def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -427,7 +422,7 @@ def create_or_update(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response)
+        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -459,7 +454,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,
@@ -482,7 +477,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -524,7 +518,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-02-01"))
         cls: ClsType[_models.ListBlobInventoryPolicy] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -543,7 +537,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -559,7 +552,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/operations/_blob_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/operations/_blob_services_operations.py
index df23d1b3ea8d..bfe1e7d192b9 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/operations/_blob_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/operations/_blob_services_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 (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -197,7 +194,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-02-01"))
         cls: ClsType[_models.BlobServiceItems] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -216,7 +213,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -232,7 +228,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -361,7 +356,7 @@ def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.BlobServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -396,7 +391,6 @@ def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -410,7 +404,7 @@ def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobServiceProperties", pipeline_response)
+        deserialized = self._deserialize("BlobServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -438,7 +432,7 @@ def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.BlobServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -461,7 +455,6 @@ def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -475,7 +468,7 @@ def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobServiceProperties", pipeline_response)
+        deserialized = self._deserialize("BlobServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/operations/_deleted_accounts_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/operations/_deleted_accounts_operations.py
index 2ca2bdd117ad..514910c26851 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/operations/_deleted_accounts_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/operations/_deleted_accounts_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 (
@@ -20,20 +19,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -130,7 +127,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.DeletedAccount"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-02-01"))
         cls: ClsType[_models.DeletedAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -147,7 +144,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -163,7 +159,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -205,7 +200,7 @@ def get(self, deleted_account_name: str, location: str, **kwargs: Any) -> _model
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.DeletedAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -227,7 +222,6 @@ def get(self, deleted_account_name: str, location: str, **kwargs: Any) -> _model
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -242,7 +236,7 @@ def get(self, deleted_account_name: str, location: str, **kwargs: Any) -> _model
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("DeletedAccount", pipeline_response)
+        deserialized = self._deserialize("DeletedAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/operations/_encryption_scopes_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/operations/_encryption_scopes_operations.py
index bf0f1063eef3..0744c8bb1104 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/operations/_encryption_scopes_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/operations/_encryption_scopes_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 (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -315,7 +312,7 @@ def put(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.EncryptionScope
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -350,7 +347,6 @@ def put(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -365,11 +361,7 @@ def put(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("EncryptionScope", pipeline_response)
-
-        if response.status_code == 201:
-            deserialized = self._deserialize("EncryptionScope", pipeline_response)
+        deserialized = self._deserialize("EncryptionScope", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -479,7 +471,7 @@ def patch(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.EncryptionScope
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -514,7 +506,6 @@ def patch(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -529,7 +520,7 @@ def patch(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("EncryptionScope", pipeline_response)
+        deserialized = self._deserialize("EncryptionScope", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -558,7 +549,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.EncryptionScope
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -581,7 +572,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -596,7 +586,7 @@ def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("EncryptionScope", pipeline_response)
+        deserialized = self._deserialize("EncryptionScope", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -624,7 +614,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> It
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-02-01"))
         cls: ClsType[_models.EncryptionScopeListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -643,7 +633,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -659,7 +648,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/operations/_file_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/operations/_file_services_operations.py
index af65055c029b..46dde938b3da 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/operations/_file_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/operations/_file_services_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,
@@ -19,20 +18,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -185,7 +182,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.FileServiceItems
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -207,7 +204,6 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -221,7 +217,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileServiceItems", pipeline_response)
+        deserialized = self._deserialize("FileServiceItems", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -328,7 +324,7 @@ def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.FileServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -363,7 +359,6 @@ def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -377,7 +372,7 @@ def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileServiceProperties", pipeline_response)
+        deserialized = self._deserialize("FileServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -405,7 +400,7 @@ def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.FileServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -428,7 +423,6 @@ def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -442,7 +436,7 @@ def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileServiceProperties", pipeline_response)
+        deserialized = self._deserialize("FileServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/operations/_file_shares_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/operations/_file_shares_operations.py
index 4319a45c1ee3..94b87a4a8228 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/operations/_file_shares_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/operations/_file_shares_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,7 @@
 # --------------------------------------------------------------------------
 from io import IOBase
 import sys
-from typing import Any, Callable, Dict, IO, Iterable, Literal, Optional, Type, TypeVar, Union, overload
+from typing import Any, Callable, Dict, IO, Iterable, Literal, Optional, TypeVar, Union, overload
 import urllib.parse
 
 from azure.core.exceptions import (
@@ -21,20 +21,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -352,7 +350,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-02-01"))
         cls: ClsType[_models.FileShareItems] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -374,7 +372,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -390,7 +387,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -534,7 +530,7 @@ def create(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.FileShare
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -570,7 +566,6 @@ def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -584,11 +579,7 @@ def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("FileShare", pipeline_response)
-
-        if response.status_code == 201:
-            deserialized = self._deserialize("FileShare", pipeline_response)
+        deserialized = self._deserialize("FileShare", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -698,7 +689,7 @@ def update(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.FileShare
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -733,7 +724,6 @@ def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -747,7 +737,7 @@ def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileShare", pipeline_response)
+        deserialized = self._deserialize("FileShare", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -788,7 +778,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.FileShare
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -813,7 +803,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -827,7 +816,7 @@ def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileShare", pipeline_response)
+        deserialized = self._deserialize("FileShare", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -863,7 +852,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,
@@ -887,7 +876,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -905,7 +893,7 @@ def delete(  # pylint: disable=inconsistent-return-statements
             return cls(pipeline_response, None, {})  # type: ignore
 
     @overload
-    def restore(  # pylint: disable=inconsistent-return-statements
+    def restore(
         self,
         resource_group_name: str,
         account_name: str,
@@ -940,7 +928,7 @@ def restore(  # pylint: disable=inconsistent-return-statements
         """
 
     @overload
-    def restore(  # pylint: disable=inconsistent-return-statements
+    def restore(
         self,
         resource_group_name: str,
         account_name: str,
@@ -1003,7 +991,7 @@ def restore(  # 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,
@@ -1038,7 +1026,6 @@ def restore(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/operations/_management_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/operations/_management_policies_operations.py
index b5bde8ded4de..55b54f5ff0b6 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/operations/_management_policies_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/operations/_management_policies_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,
@@ -19,20 +18,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -196,7 +193,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.ManagementPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -219,7 +216,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -233,7 +229,7 @@ def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ManagementPolicy", pipeline_response)
+        deserialized = self._deserialize("ManagementPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -337,7 +333,7 @@ def create_or_update(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.ManagementPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -372,7 +368,6 @@ def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -386,7 +381,7 @@ def create_or_update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ManagementPolicy", pipeline_response)
+        deserialized = self._deserialize("ManagementPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -418,7 +413,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,
@@ -441,7 +436,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/operations/_object_replication_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/operations/_object_replication_policies_operations.py
index b3cf539bbbe1..5cc952564b9a 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/operations/_object_replication_policies_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/operations/_object_replication_policies_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 (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -229,7 +226,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-02-01"))
         cls: ClsType[_models.ObjectReplicationPolicies] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -248,7 +245,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -264,7 +260,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -314,7 +309,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.ObjectReplicationPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -337,7 +332,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -352,7 +346,7 @@ def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response)
+        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -456,7 +450,7 @@ def create_or_update(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.ObjectReplicationPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -491,7 +485,6 @@ def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -506,7 +499,7 @@ def create_or_update(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response)
+        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -533,7 +526,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,
@@ -556,7 +549,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/operations/_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/operations/_operations.py
index ad0e815861c6..81eb2929a75b 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/operations/_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/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 (
@@ -20,20 +19,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -94,7 +91,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.Operation"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-02-01"))
         cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -110,7 +107,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -126,7 +122,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/operations/_private_endpoint_connections_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/operations/_private_endpoint_connections_operations.py
index bf0eecf41c46..3525cd388608 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/operations/_private_endpoint_connections_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/operations/_private_endpoint_connections_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 (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -241,7 +238,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-02-01"))
         cls: ClsType[_models.PrivateEndpointConnectionListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -260,7 +257,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -276,7 +272,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -325,7 +320,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.PrivateEndpointConnection
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -348,7 +343,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -363,7 +357,7 @@ def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response)
+        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -464,7 +458,7 @@ def put(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.PrivateEndpointConnection
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -499,7 +493,6 @@ def put(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -514,7 +507,7 @@ def put(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response)
+        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -541,7 +534,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,
@@ -564,7 +557,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/operations/_private_link_resources_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/operations/_private_link_resources_operations.py
index c994da87fe6d..9dfc72892cfb 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/operations/_private_link_resources_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/operations/_private_link_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, Optional, Type, TypeVar
+from typing import Any, Callable, Dict, Optional, TypeVar
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -18,20 +17,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -109,7 +106,7 @@ def list_by_storage_account(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.PrivateLinkResourceListResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -131,7 +128,6 @@ def list_by_storage_account(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -145,7 +141,7 @@ def list_by_storage_account(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("PrivateLinkResourceListResult", pipeline_response)
+        deserialized = self._deserialize("PrivateLinkResourceListResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/operations/_queue_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/operations/_queue_operations.py
index af9cbd501961..9c5de07635e2 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/operations/_queue_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/operations/_queue_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 (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -375,7 +372,7 @@ def create(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.StorageQueue
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -410,7 +407,6 @@ def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -424,7 +420,7 @@ def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageQueue", pipeline_response)
+        deserialized = self._deserialize("StorageQueue", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -531,7 +527,7 @@ def update(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.StorageQueue
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -566,7 +562,6 @@ def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -580,7 +575,7 @@ def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageQueue", pipeline_response)
+        deserialized = self._deserialize("StorageQueue", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -607,7 +602,7 @@ def get(self, resource_group_name: str, account_name: str, queue_name: str, **kw
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.StorageQueue
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -630,7 +625,6 @@ def get(self, resource_group_name: str, account_name: str, queue_name: str, **kw
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -644,7 +638,7 @@ def get(self, resource_group_name: str, account_name: str, queue_name: str, **kw
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageQueue", pipeline_response)
+        deserialized = self._deserialize("StorageQueue", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -673,7 +667,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,
@@ -696,7 +690,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -747,7 +740,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-02-01"))
         cls: ClsType[_models.ListQueueResource] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -768,7 +761,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -784,7 +776,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/operations/_queue_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/operations/_queue_services_operations.py
index 8a599f5fe375..bf5b95c5428e 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/operations/_queue_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/operations/_queue_services_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,
@@ -19,20 +18,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -185,7 +182,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.ListQueueServices
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -207,7 +204,6 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -221,7 +217,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListQueueServices", pipeline_response)
+        deserialized = self._deserialize("ListQueueServices", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -328,7 +324,7 @@ def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.QueueServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -363,7 +359,6 @@ def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -377,7 +372,7 @@ def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("QueueServiceProperties", pipeline_response)
+        deserialized = self._deserialize("QueueServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -405,7 +400,7 @@ def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.QueueServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -428,7 +423,6 @@ def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -442,7 +436,7 @@ def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("QueueServiceProperties", pipeline_response)
+        deserialized = self._deserialize("QueueServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/operations/_skus_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/operations/_skus_operations.py
index bb75cce90afb..5df9a683bb14 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/operations/_skus_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/operations/_skus_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 (
@@ -20,20 +19,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -99,7 +96,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.SkuInformation"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-02-01"))
         cls: ClsType[_models.StorageSkuListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -116,7 +113,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -132,7 +128,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/operations/_storage_accounts_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/operations/_storage_accounts_operations.py
index 8e0493052e4b..0eb76c326b52 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/operations/_storage_accounts_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/operations/_storage_accounts_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,7 @@
 # --------------------------------------------------------------------------
 from io import IOBase
 import sys
-from typing import Any, Callable, Dict, IO, Iterable, Literal, Optional, Type, TypeVar, Union, cast, overload
+from typing import Any, Callable, Dict, IO, Iterable, Iterator, Literal, Optional, TypeVar, Union, cast, overload
 import urllib.parse
 
 from azure.core.exceptions import (
@@ -17,13 +17,14 @@
     ResourceExistsError,
     ResourceNotFoundError,
     ResourceNotModifiedError,
+    StreamClosedError,
+    StreamConsumedError,
     map_error,
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
 from azure.core.polling import LROPoller, NoPolling, PollingMethod
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
@@ -31,12 +32,11 @@
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -582,7 +582,7 @@ def check_name_availability(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.CheckNameAvailabilityResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -614,7 +614,6 @@ def check_name_availability(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -628,7 +627,7 @@ def check_name_availability(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response)
+        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -641,8 +640,8 @@ def _create_initial(
         account_name: str,
         parameters: Union[_models.StorageAccountCreateParameters, IO[bytes]],
         **kwargs: Any
-    ) -> Optional[_models.StorageAccount]:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> Iterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -655,7 +654,7 @@ def _create_initial(
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-02-01"))
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
-        cls: ClsType[Optional[_models.StorageAccount]] = kwargs.pop("cls", None)
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
         _json = None
@@ -676,10 +675,10 @@ def _create_initial(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -687,12 +686,14 @@ def _create_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = None
-        if response.status_code == 200:
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -815,10 +816,11 @@ def begin_create(
                 params=_params,
                 **kwargs
             )
+            raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+            deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
             if cls:
                 return cls(pipeline_response, deserialized, {})  # type: ignore
             return deserialized
@@ -857,7 +859,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,
@@ -879,7 +881,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -924,7 +925,7 @@ def get_properties(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -947,7 +948,6 @@ def get_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -961,7 +961,7 @@ def get_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1072,7 +1072,7 @@ def update(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1106,7 +1106,6 @@ def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1120,7 +1119,7 @@ def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1142,7 +1141,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.StorageAccount"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-02-01"))
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1159,7 +1158,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -1175,7 +1173,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -1222,7 +1219,7 @@ def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> Ite
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-02-01"))
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1240,7 +1237,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -1256,7 +1252,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -1306,7 +1301,7 @@ def list_keys(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.StorageAccountListKeysResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1329,7 +1324,6 @@ def list_keys(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1343,7 +1337,7 @@ def list_keys(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response)
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1437,7 +1431,7 @@ def regenerate_key(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.StorageAccountListKeysResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1471,7 +1465,6 @@ def regenerate_key(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1485,7 +1478,7 @@ def regenerate_key(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response)
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1576,7 +1569,7 @@ def list_account_sas(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.ListAccountSasResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1610,7 +1603,6 @@ def list_account_sas(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1624,7 +1616,7 @@ def list_account_sas(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListAccountSasResponse", pipeline_response)
+        deserialized = self._deserialize("ListAccountSasResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1713,7 +1705,7 @@ def list_service_sas(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.ListServiceSasResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1747,7 +1739,6 @@ def list_service_sas(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1761,17 +1752,15 @@ def list_service_sas(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListServiceSasResponse", pipeline_response)
+        deserialized = self._deserialize("ListServiceSasResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
 
         return deserialized  # type: ignore
 
-    def _failover_initial(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, **kwargs: Any
-    ) -> None:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    def _failover_initial(self, resource_group_name: str, account_name: str, **kwargs: Any) -> Iterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1783,7 +1772,7 @@ def _failover_initial(  # pylint: disable=inconsistent-return-statements
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-02-01"))
-        cls: ClsType[None] = kwargs.pop("cls", None)
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
 
         _request = build_failover_request(
             resource_group_name=resource_group_name,
@@ -1793,10 +1782,10 @@ def _failover_initial(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -1804,11 +1793,19 @@ def _failover_initial(  # pylint: disable=inconsistent-return-statements
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
-            return cls(pipeline_response, None, {})  # type: ignore
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
 
     @distributed_trace
     def begin_failover(self, resource_group_name: str, account_name: str, **kwargs: Any) -> LROPoller[None]:
@@ -1836,7 +1833,7 @@ def begin_failover(self, resource_group_name: str, account_name: str, **kwargs:
         lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
         cont_token: Optional[str] = kwargs.pop("continuation_token", None)
         if cont_token is None:
-            raw_result = self._failover_initial(  # type: ignore
+            raw_result = self._failover_initial(
                 resource_group_name=resource_group_name,
                 account_name=account_name,
                 api_version=api_version,
@@ -1845,6 +1842,7 @@ def begin_failover(self, resource_group_name: str, account_name: str, **kwargs:
                 params=_params,
                 **kwargs
             )
+            raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
@@ -1874,8 +1872,8 @@ def _restore_blob_ranges_initial(
         account_name: str,
         parameters: Union[_models.BlobRestoreParameters, IO[bytes]],
         **kwargs: Any
-    ) -> _models.BlobRestoreStatus:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> Iterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1888,7 +1886,7 @@ def _restore_blob_ranges_initial(
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-02-01"))
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
-        cls: ClsType[_models.BlobRestoreStatus] = kwargs.pop("cls", None)
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
         _json = None
@@ -1909,10 +1907,10 @@ def _restore_blob_ranges_initial(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -1920,14 +1918,14 @@ def _restore_blob_ranges_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response)
-
-        if response.status_code == 202:
-            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response)
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -2040,10 +2038,11 @@ def begin_restore_blob_ranges(
                 params=_params,
                 **kwargs
             )
+            raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):
-            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response)
+            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response.http_response)
             if cls:
                 return cls(pipeline_response, deserialized, {})  # type: ignore
             return deserialized
@@ -2084,7 +2083,7 @@ def revoke_user_delegation_keys(  # pylint: disable=inconsistent-return-statemen
         :rtype: None
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -2106,7 +2105,6 @@ def revoke_user_delegation_keys(  # pylint: disable=inconsistent-return-statemen
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/operations/_table_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/operations/_table_operations.py
index 4188a39cea35..d14b866b577a 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/operations/_table_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/operations/_table_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 (
@@ -20,20 +19,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -255,7 +252,7 @@ def create(self, resource_group_name: str, account_name: str, table_name: str, *
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.Table
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -278,7 +275,6 @@ def create(self, resource_group_name: str, account_name: str, table_name: str, *
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -292,7 +288,7 @@ def create(self, resource_group_name: str, account_name: str, table_name: str, *
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("Table", pipeline_response)
+        deserialized = self._deserialize("Table", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -318,7 +314,7 @@ def update(self, resource_group_name: str, account_name: str, table_name: str, *
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.Table
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -341,7 +337,6 @@ def update(self, resource_group_name: str, account_name: str, table_name: str, *
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -355,7 +350,7 @@ def update(self, resource_group_name: str, account_name: str, table_name: str, *
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("Table", pipeline_response)
+        deserialized = self._deserialize("Table", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -381,7 +376,7 @@ def get(self, resource_group_name: str, account_name: str, table_name: str, **kw
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.Table
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -404,7 +399,6 @@ def get(self, resource_group_name: str, account_name: str, table_name: str, **kw
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -418,7 +412,7 @@ def get(self, resource_group_name: str, account_name: str, table_name: str, **kw
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("Table", pipeline_response)
+        deserialized = self._deserialize("Table", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -446,7 +440,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,
@@ -469,7 +463,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -507,7 +500,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> It
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-02-01"))
         cls: ClsType[_models.ListTableResource] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -526,7 +519,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -542,7 +534,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/operations/_table_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/operations/_table_services_operations.py
index 6e4f0daccbe9..2f97a6ba9cc9 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/operations/_table_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/operations/_table_services_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,
@@ -19,20 +18,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -185,7 +182,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.ListTableServices
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -207,7 +204,6 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -221,7 +217,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListTableServices", pipeline_response)
+        deserialized = self._deserialize("ListTableServices", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -328,7 +324,7 @@ def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.TableServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -363,7 +359,6 @@ def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -377,7 +372,7 @@ def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("TableServiceProperties", pipeline_response)
+        deserialized = self._deserialize("TableServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -405,7 +400,7 @@ def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_02_01.models.TableServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -428,7 +423,6 @@ def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -442,7 +436,7 @@ def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("TableServiceProperties", pipeline_response)
+        deserialized = self._deserialize("TableServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/operations/_usages_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/operations/_usages_operations.py
index 48091a67c8e3..f62b5fef4a05 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/operations/_usages_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_02_01/operations/_usages_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 (
@@ -20,20 +19,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -105,7 +102,7 @@ def list_by_location(self, location: str, **kwargs: Any) -> Iterable["_models.Us
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-02-01"))
         cls: ClsType[_models.UsageListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -123,7 +120,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -139,7 +135,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/__init__.py
index a860a5c185c9..60980065e1ee 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/__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 ._storage_management_client import StorageManagementClient
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._storage_management_client import StorageManagementClient  # 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__ = [
     "StorageManagementClient",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/_configuration.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/_configuration.py
index 03ebdfc441f4..80db472ca618 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/_configuration.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/_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 StorageManagementClientConfiguration:  # pylint: disable=too-many-instance-attributes,name-too-long
+class StorageManagementClientConfiguration:  # pylint: disable=too-many-instance-attributes
     """Configuration for StorageManagementClient.
 
     Note that all parameters used to create this instance are saved as instance
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/_metadata.json b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/_metadata.json
index 7320234d7316..b247414835e4 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/_metadata.json
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/_metadata.json
@@ -10,8 +10,8 @@
         "azure_arm": true,
         "has_public_lro_operations": true,
         "client_side_validation": false,
-        "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"ARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementClientConfiguration\"], \".._serialization\": [\"Deserializer\", \"Serializer\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}}",
-        "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"AsyncARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"AsyncARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementClientConfiguration\"], \"..._serialization\": [\"Deserializer\", \"Serializer\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"]}}}"
+        "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"ARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementClientConfiguration\"], \".._serialization\": [\"Deserializer\", \"Serializer\"]}, \"stdlib\": {\"typing_extensions\": [\"Self\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}}",
+        "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"AsyncARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"AsyncARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementClientConfiguration\"], \"..._serialization\": [\"Deserializer\", \"Serializer\"]}, \"stdlib\": {\"typing_extensions\": [\"Self\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"]}}}"
     },
     "global_parameters": {
         "sync": {
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/_storage_management_client.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/_storage_management_client.py
index 79386dd910fd..03394b7d1605 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/_storage_management_client.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/_storage_management_client.py
@@ -8,6 +8,7 @@
 
 from copy import deepcopy
 from typing import Any, TYPE_CHECKING
+from typing_extensions import Self
 
 from azure.core.pipeline import policies
 from azure.core.rest import HttpRequest, HttpResponse
@@ -40,11 +41,10 @@
 )
 
 if TYPE_CHECKING:
-    # pylint: disable=unused-import,ungrouped-imports
     from azure.core.credentials import TokenCredential
 
 
-class StorageManagementClient:  # pylint: disable=client-accepts-api-version-keyword,too-many-instance-attributes
+class StorageManagementClient:  # pylint: disable=too-many-instance-attributes
     """The Azure Storage Management API.
 
     :ivar operations: Operations operations
@@ -211,7 +211,7 @@ def _send_request(self, request: HttpRequest, *, stream: bool = False, **kwargs:
     def close(self) -> None:
         self._client.close()
 
-    def __enter__(self) -> "StorageManagementClient":
+    def __enter__(self) -> Self:
         self._client.__enter__()
         return self
 
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/_vendor.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/_vendor.py
deleted file mode 100644
index 0dafe0e287ff..000000000000
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/_vendor.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# --------------------------------------------------------------------------
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License. See License.txt in the project root for license information.
-# Code generated by Microsoft (R) AutoRest Code Generator.
-# Changes may cause incorrect behavior and will be lost if the code is regenerated.
-# --------------------------------------------------------------------------
-
-from azure.core.pipeline.transport import HttpRequest
-
-
-def _convert_request(request, files=None):
-    data = request.content if not files else None
-    request = HttpRequest(method=request.method, url=request.url, headers=request.headers, data=data)
-    if files:
-        request.set_formdata_body(files)
-    return request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/_version.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/_version.py
index 5a163c0afedc..e5754a47ce68 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/_version.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/_version.py
@@ -6,4 +6,4 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-VERSION = "21.2.1"
\ No newline at end of file
+VERSION = "1.0.0b1"
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/__init__.py
index a5c3d2414cfd..ee2b940bd4fc 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/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 ._storage_management_client import StorageManagementClient
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._storage_management_client import StorageManagementClient  # 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__ = [
     "StorageManagementClient",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/_configuration.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/_configuration.py
index c5765ad05aae..96f8fc59c3d6 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/_configuration.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/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 StorageManagementClientConfiguration:  # pylint: disable=too-many-instance-attributes,name-too-long
+class StorageManagementClientConfiguration:  # pylint: disable=too-many-instance-attributes
     """Configuration for StorageManagementClient.
 
     Note that all parameters used to create this instance are saved as instance
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/_storage_management_client.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/_storage_management_client.py
index 9b925d1c4783..42ac8a3a817e 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/_storage_management_client.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/_storage_management_client.py
@@ -8,6 +8,7 @@
 
 from copy import deepcopy
 from typing import Any, Awaitable, TYPE_CHECKING
+from typing_extensions import Self
 
 from azure.core.pipeline import policies
 from azure.core.rest import AsyncHttpResponse, HttpRequest
@@ -40,11 +41,10 @@
 )
 
 if TYPE_CHECKING:
-    # pylint: disable=unused-import,ungrouped-imports
     from azure.core.credentials_async import AsyncTokenCredential
 
 
-class StorageManagementClient:  # pylint: disable=client-accepts-api-version-keyword,too-many-instance-attributes
+class StorageManagementClient:  # pylint: disable=too-many-instance-attributes
     """The Azure Storage Management API.
 
     :ivar operations: Operations operations
@@ -216,7 +216,7 @@ def _send_request(
     async def close(self) -> None:
         await self._client.close()
 
-    async def __aenter__(self) -> "StorageManagementClient":
+    async def __aenter__(self) -> Self:
         await self._client.__aenter__()
         return self
 
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/operations/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/operations/__init__.py
index 0f201012e160..d406c5bf4d6b 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/operations/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/operations/__init__.py
@@ -5,29 +5,35 @@
 # 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 ._skus_operations import SkusOperations
-from ._storage_accounts_operations import StorageAccountsOperations
-from ._deleted_accounts_operations import DeletedAccountsOperations
-from ._usages_operations import UsagesOperations
-from ._management_policies_operations import ManagementPoliciesOperations
-from ._blob_inventory_policies_operations import BlobInventoryPoliciesOperations
-from ._private_endpoint_connections_operations import PrivateEndpointConnectionsOperations
-from ._private_link_resources_operations import PrivateLinkResourcesOperations
-from ._object_replication_policies_operations import ObjectReplicationPoliciesOperations
-from ._encryption_scopes_operations import EncryptionScopesOperations
-from ._blob_services_operations import BlobServicesOperations
-from ._blob_containers_operations import BlobContainersOperations
-from ._file_services_operations import FileServicesOperations
-from ._file_shares_operations import FileSharesOperations
-from ._queue_services_operations import QueueServicesOperations
-from ._queue_operations import QueueOperations
-from ._table_services_operations import TableServicesOperations
-from ._table_operations import TableOperations
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._operations import Operations  # type: ignore
+from ._skus_operations import SkusOperations  # type: ignore
+from ._storage_accounts_operations import StorageAccountsOperations  # type: ignore
+from ._deleted_accounts_operations import DeletedAccountsOperations  # type: ignore
+from ._usages_operations import UsagesOperations  # type: ignore
+from ._management_policies_operations import ManagementPoliciesOperations  # type: ignore
+from ._blob_inventory_policies_operations import BlobInventoryPoliciesOperations  # type: ignore
+from ._private_endpoint_connections_operations import PrivateEndpointConnectionsOperations  # type: ignore
+from ._private_link_resources_operations import PrivateLinkResourcesOperations  # type: ignore
+from ._object_replication_policies_operations import ObjectReplicationPoliciesOperations  # type: ignore
+from ._encryption_scopes_operations import EncryptionScopesOperations  # type: ignore
+from ._blob_services_operations import BlobServicesOperations  # type: ignore
+from ._blob_containers_operations import BlobContainersOperations  # type: ignore
+from ._file_services_operations import FileServicesOperations  # type: ignore
+from ._file_shares_operations import FileSharesOperations  # type: ignore
+from ._queue_services_operations import QueueServicesOperations  # type: ignore
+from ._queue_operations import QueueOperations  # type: ignore
+from ._table_services_operations import TableServicesOperations  # type: ignore
+from ._table_operations import TableOperations  # 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__ = [
@@ -51,5 +57,5 @@
     "TableServicesOperations",
     "TableOperations",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/operations/_blob_containers_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/operations/_blob_containers_operations.py
index 9c56fa59611e..ef00c7d3e73b 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/operations/_blob_containers_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/operations/_blob_containers_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,7 @@
 # --------------------------------------------------------------------------
 from io import IOBase
 import sys
-from typing import Any, AsyncIterable, 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
@@ -18,12 +18,13 @@
     ResourceExistsError,
     ResourceNotFoundError,
     ResourceNotModifiedError,
+    StreamClosedError,
+    StreamConsumedError,
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
 from azure.core.polling import AsyncLROPoller, AsyncNoPolling, AsyncPollingMethod
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
@@ -31,7 +32,6 @@
 from azure.mgmt.core.polling.async_arm_polling import AsyncARMPolling
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._blob_containers_operations import (
     build_clear_legal_hold_request,
     build_create_or_update_immutability_policy_request,
@@ -52,7 +52,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]]
 
@@ -117,7 +117,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-04-01"))
         cls: ClsType[_models.ListContainerItems] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -139,7 +139,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -155,7 +154,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -290,7 +288,7 @@ async def create(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -325,7 +323,6 @@ async def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -339,11 +336,7 @@ async def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("BlobContainer", pipeline_response)
-
-        if response.status_code == 201:
-            deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -453,7 +446,7 @@ async def update(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -488,7 +481,6 @@ async def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -502,7 +494,7 @@ async def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -531,7 +523,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -554,7 +546,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -568,7 +559,7 @@ async def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -576,9 +567,7 @@ async def get(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, container_name: str, **kwargs: Any
-    ) -> None:
+    async def delete(self, resource_group_name: str, account_name: str, container_name: str, **kwargs: Any) -> None:
         """Deletes specified container under its account.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -597,7 +586,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,
@@ -620,7 +609,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -743,7 +731,7 @@ async def set_legal_hold(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.LegalHold
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -778,7 +766,6 @@ async def set_legal_hold(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -792,7 +779,7 @@ async def set_legal_hold(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LegalHold", pipeline_response)
+        deserialized = self._deserialize("LegalHold", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -902,7 +889,7 @@ async def clear_legal_hold(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.LegalHold
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -937,7 +924,6 @@ async def clear_legal_hold(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -951,7 +937,7 @@ async def clear_legal_hold(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LegalHold", pipeline_response)
+        deserialized = self._deserialize("LegalHold", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1090,7 +1076,7 @@ async def create_or_update_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1130,7 +1116,6 @@ async def create_or_update_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1147,7 +1132,7 @@ async def create_or_update_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1190,7 +1175,7 @@ async def get_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1215,7 +1200,6 @@ async def get_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1232,7 +1216,7 @@ async def get_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1277,7 +1261,7 @@ async def delete_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1302,7 +1286,6 @@ async def delete_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1319,7 +1302,7 @@ async def delete_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1353,7 +1336,7 @@ async def lock_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1377,7 +1360,6 @@ async def lock_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1394,7 +1376,7 @@ async def lock_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1524,7 +1506,7 @@ async def extend_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1563,7 +1545,6 @@ async def extend_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1580,7 +1561,7 @@ async def extend_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1690,7 +1671,7 @@ async def lease(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.LeaseContainerResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1728,7 +1709,6 @@ async def lease(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1742,17 +1722,17 @@ async def lease(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LeaseContainerResponse", pipeline_response)
+        deserialized = self._deserialize("LeaseContainerResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
 
         return deserialized  # type: ignore
 
-    async def _object_level_worm_initial(  # pylint: disable=inconsistent-return-statements
+    async def _object_level_worm_initial(
         self, resource_group_name: str, account_name: str, container_name: str, **kwargs: Any
-    ) -> None:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1764,7 +1744,7 @@ async def _object_level_worm_initial(  # pylint: disable=inconsistent-return-sta
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-04-01"))
-        cls: ClsType[None] = kwargs.pop("cls", None)
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
 
         _request = build_object_level_worm_request(
             resource_group_name=resource_group_name,
@@ -1775,10 +1755,10 @@ async def _object_level_worm_initial(  # pylint: disable=inconsistent-return-sta
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -1786,11 +1766,19 @@ async def _object_level_worm_initial(  # pylint: disable=inconsistent-return-sta
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
-            return cls(pipeline_response, None, {})  # type: ignore
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
 
     @distributed_trace_async
     async def begin_object_level_worm(
@@ -1826,7 +1814,7 @@ async def begin_object_level_worm(
         lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
         cont_token: Optional[str] = kwargs.pop("continuation_token", None)
         if cont_token is None:
-            raw_result = await self._object_level_worm_initial(  # type: ignore
+            raw_result = await self._object_level_worm_initial(
                 resource_group_name=resource_group_name,
                 account_name=account_name,
                 container_name=container_name,
@@ -1836,6 +1824,7 @@ async def begin_object_level_worm(
                 params=_params,
                 **kwargs
             )
+            await raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/operations/_blob_inventory_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/operations/_blob_inventory_policies_operations.py
index 0ea553b42740..33f35dbc2096 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/operations/_blob_inventory_policies_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/operations/_blob_inventory_policies_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._blob_inventory_policies_operations import (
     build_create_or_update_request,
     build_delete_request,
@@ -40,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]]
 
@@ -90,7 +87,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.BlobInventoryPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -113,7 +110,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -128,7 +124,7 @@ async def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response)
+        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -232,7 +228,7 @@ async def create_or_update(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.BlobInventoryPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -267,7 +263,6 @@ async def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -282,7 +277,7 @@ async def create_or_update(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response)
+        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -290,7 +285,7 @@ async def create_or_update(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
+    async def delete(
         self,
         resource_group_name: str,
         account_name: str,
@@ -314,7 +309,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,
@@ -337,7 +332,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -379,7 +373,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-04-01"))
         cls: ClsType[_models.ListBlobInventoryPolicy] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -398,7 +392,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -414,7 +407,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/operations/_blob_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/operations/_blob_services_operations.py
index 50363f77bf92..7ab0ad642bb5 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/operations/_blob_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/operations/_blob_services_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._blob_services_operations import (
     build_get_service_properties_request,
     build_list_request,
@@ -39,7 +36,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 +86,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-04-01"))
         cls: ClsType[_models.BlobServiceItems] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -108,7 +105,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -124,7 +120,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -253,7 +248,7 @@ async def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.BlobServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -288,7 +283,6 @@ async def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -302,7 +296,7 @@ async def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobServiceProperties", pipeline_response)
+        deserialized = self._deserialize("BlobServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -330,7 +324,7 @@ async def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.BlobServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -353,7 +347,6 @@ async def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -367,7 +360,7 @@ async def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobServiceProperties", pipeline_response)
+        deserialized = self._deserialize("BlobServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/operations/_deleted_accounts_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/operations/_deleted_accounts_operations.py
index c2114db4e0d9..41939a369911 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/operations/_deleted_accounts_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/operations/_deleted_accounts_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
@@ -20,21 +19,19 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._deleted_accounts_operations import build_get_request, build_list_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
 
@@ -74,7 +71,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.DeletedAccount"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-04-01"))
         cls: ClsType[_models.DeletedAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -91,7 +88,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -107,7 +103,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -149,7 +144,7 @@ async def get(self, deleted_account_name: str, location: str, **kwargs: Any) ->
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.DeletedAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -171,7 +166,6 @@ async def get(self, deleted_account_name: str, location: str, **kwargs: Any) ->
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -186,7 +180,7 @@ async def get(self, deleted_account_name: str, location: str, **kwargs: Any) ->
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("DeletedAccount", pipeline_response)
+        deserialized = self._deserialize("DeletedAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/operations/_encryption_scopes_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/operations/_encryption_scopes_operations.py
index 11a48251eb0b..4f4a58f745bd 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/operations/_encryption_scopes_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/operations/_encryption_scopes_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._encryption_scopes_operations import (
     build_get_request,
     build_list_request,
@@ -40,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]]
 
@@ -173,7 +170,7 @@ async def put(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.EncryptionScope
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -208,7 +205,6 @@ async def put(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -223,11 +219,7 @@ async def put(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("EncryptionScope", pipeline_response)
-
-        if response.status_code == 201:
-            deserialized = self._deserialize("EncryptionScope", pipeline_response)
+        deserialized = self._deserialize("EncryptionScope", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -337,7 +329,7 @@ async def patch(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.EncryptionScope
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -372,7 +364,6 @@ async def patch(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -387,7 +378,7 @@ async def patch(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("EncryptionScope", pipeline_response)
+        deserialized = self._deserialize("EncryptionScope", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -416,7 +407,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.EncryptionScope
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -439,7 +430,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -454,7 +444,7 @@ async def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("EncryptionScope", pipeline_response)
+        deserialized = self._deserialize("EncryptionScope", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -485,7 +475,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-04-01"))
         cls: ClsType[_models.EncryptionScopeListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -504,7 +494,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -520,7 +509,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/operations/_file_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/operations/_file_services_operations.py
index 2f7e34171803..eb3344b39965 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/operations/_file_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/operations/_file_services_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,
@@ -19,14 +18,12 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._file_services_operations import (
     build_get_service_properties_request,
     build_list_request,
@@ -36,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]]
 
@@ -76,7 +73,7 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.FileServiceItems
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -98,7 +95,6 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -113,7 +109,7 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
             error = self._deserialize.failsafe_deserialize(_models.CloudErrorAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileServiceItems", pipeline_response)
+        deserialized = self._deserialize("FileServiceItems", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -220,7 +216,7 @@ async def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.FileServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -255,7 +251,6 @@ async def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -270,7 +265,7 @@ async def set_service_properties(
             error = self._deserialize.failsafe_deserialize(_models.CloudErrorAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileServiceProperties", pipeline_response)
+        deserialized = self._deserialize("FileServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -298,7 +293,7 @@ async def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.FileServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -321,7 +316,6 @@ async def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -336,7 +330,7 @@ async def get_service_properties(
             error = self._deserialize.failsafe_deserialize(_models.CloudErrorAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileServiceProperties", pipeline_response)
+        deserialized = self._deserialize("FileServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/operations/_file_shares_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/operations/_file_shares_operations.py
index 72f6609eb22a..16ed9a0c5be2 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/operations/_file_shares_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/operations/_file_shares_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._file_shares_operations import (
     build_create_request,
     build_delete_request,
@@ -43,7 +40,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]]
 
@@ -108,7 +105,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-04-01"))
         cls: ClsType[_models.FileShareItems] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -130,7 +127,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -146,7 +142,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -294,7 +289,7 @@ async def create(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.FileShare
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -330,7 +325,6 @@ async def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -345,11 +339,7 @@ async def create(
             error = self._deserialize.failsafe_deserialize(_models.CloudErrorAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("FileShare", pipeline_response)
-
-        if response.status_code == 201:
-            deserialized = self._deserialize("FileShare", pipeline_response)
+        deserialized = self._deserialize("FileShare", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -459,7 +449,7 @@ async def update(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.FileShare
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -494,7 +484,6 @@ async def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -509,7 +498,7 @@ async def update(
             error = self._deserialize.failsafe_deserialize(_models.CloudErrorAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileShare", pipeline_response)
+        deserialized = self._deserialize("FileShare", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -550,7 +539,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.FileShare
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -575,7 +564,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -590,7 +578,7 @@ async def get(
             error = self._deserialize.failsafe_deserialize(_models.CloudErrorAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileShare", pipeline_response)
+        deserialized = self._deserialize("FileShare", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -598,7 +586,7 @@ async def get(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
+    async def delete(
         self,
         resource_group_name: str,
         account_name: str,
@@ -635,7 +623,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,
@@ -660,7 +648,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -679,7 +666,7 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             return cls(pipeline_response, None, {})  # type: ignore
 
     @overload
-    async def restore(  # pylint: disable=inconsistent-return-statements
+    async def restore(
         self,
         resource_group_name: str,
         account_name: str,
@@ -714,7 +701,7 @@ async def restore(  # pylint: disable=inconsistent-return-statements
         """
 
     @overload
-    async def restore(  # pylint: disable=inconsistent-return-statements
+    async def restore(
         self,
         resource_group_name: str,
         account_name: str,
@@ -749,7 +736,7 @@ async def restore(  # pylint: disable=inconsistent-return-statements
         """
 
     @distributed_trace_async
-    async def restore(  # pylint: disable=inconsistent-return-statements
+    async def restore(
         self,
         resource_group_name: str,
         account_name: str,
@@ -777,7 +764,7 @@ async def restore(  # 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,
@@ -812,7 +799,6 @@ async def restore(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -945,7 +931,7 @@ async def lease(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.LeaseShareResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -984,7 +970,6 @@ async def lease(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1002,7 +987,7 @@ async def lease(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("LeaseShareResponse", pipeline_response)
+        deserialized = self._deserialize("LeaseShareResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/operations/_management_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/operations/_management_policies_operations.py
index 004fd58c4283..064210286a08 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/operations/_management_policies_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/operations/_management_policies_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,
@@ -19,14 +18,12 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._management_policies_operations import (
     build_create_or_update_request,
     build_delete_request,
@@ -36,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]]
 
@@ -86,7 +83,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.ManagementPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -109,7 +106,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -123,7 +119,7 @@ async def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ManagementPolicy", pipeline_response)
+        deserialized = self._deserialize("ManagementPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -227,7 +223,7 @@ async def create_or_update(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.ManagementPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -262,7 +258,6 @@ async def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -276,7 +271,7 @@ async def create_or_update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ManagementPolicy", pipeline_response)
+        deserialized = self._deserialize("ManagementPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -284,7 +279,7 @@ async def create_or_update(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
+    async def delete(
         self,
         resource_group_name: str,
         account_name: str,
@@ -308,7 +303,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,
@@ -331,7 +326,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/operations/_object_replication_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/operations/_object_replication_policies_operations.py
index d26abe662500..7d5fccadb712 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/operations/_object_replication_policies_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/operations/_object_replication_policies_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._object_replication_policies_operations import (
     build_create_or_update_request,
     build_delete_request,
@@ -40,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]]
 
@@ -90,7 +87,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-04-01"))
         cls: ClsType[_models.ObjectReplicationPolicies] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -109,7 +106,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -125,7 +121,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -177,7 +172,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.ObjectReplicationPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -200,7 +195,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -215,7 +209,7 @@ async def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response)
+        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -325,7 +319,7 @@ async def create_or_update(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.ObjectReplicationPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -360,7 +354,6 @@ async def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -375,7 +368,7 @@ async def create_or_update(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response)
+        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -383,7 +376,7 @@ async def create_or_update(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
+    async def delete(
         self, resource_group_name: str, account_name: str, object_replication_policy_id: str, **kwargs: Any
     ) -> None:
         """Deletes the object replication policy associated with the specified storage account.
@@ -404,7 +397,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,
@@ -427,7 +420,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/operations/_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/operations/_operations.py
index 5e24779407b4..40471cc034fd 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/operations/_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/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
@@ -20,20 +19,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._operations import build_list_request
 
 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]]
 
@@ -73,7 +70,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.Operation"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-04-01"))
         cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -89,7 +86,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -105,7 +101,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/operations/_private_endpoint_connections_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/operations/_private_endpoint_connections_operations.py
index 0aa67b410e62..ca6da68f5b12 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/operations/_private_endpoint_connections_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/operations/_private_endpoint_connections_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._private_endpoint_connections_operations import (
     build_delete_request,
     build_get_request,
@@ -40,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]]
 
@@ -90,7 +87,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-04-01"))
         cls: ClsType[_models.PrivateEndpointConnectionListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -109,7 +106,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -125,7 +121,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -174,7 +169,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.PrivateEndpointConnection
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -197,7 +192,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -212,7 +206,7 @@ async def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response)
+        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -313,7 +307,7 @@ async def put(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.PrivateEndpointConnection
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -348,7 +342,6 @@ async def put(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -363,7 +356,7 @@ async def put(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response)
+        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -371,7 +364,7 @@ async def put(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
+    async def delete(
         self, resource_group_name: str, account_name: str, private_endpoint_connection_name: str, **kwargs: Any
     ) -> None:
         """Deletes the specified private endpoint connection associated with the storage account.
@@ -390,7 +383,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,
@@ -413,7 +406,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/operations/_private_link_resources_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/operations/_private_link_resources_operations.py
index 581739b525b8..807f59c2dabc 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/operations/_private_link_resources_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/operations/_private_link_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, Optional, Type, TypeVar
+from typing import Any, Callable, Dict, Optional, TypeVar
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -18,20 +17,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._private_link_resources_operations import build_list_by_storage_account_request
 
 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]]
 
@@ -73,7 +70,7 @@ async def list_by_storage_account(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.PrivateLinkResourceListResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -95,7 +92,6 @@ async def list_by_storage_account(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -109,7 +105,7 @@ async def list_by_storage_account(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("PrivateLinkResourceListResult", pipeline_response)
+        deserialized = self._deserialize("PrivateLinkResourceListResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/operations/_queue_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/operations/_queue_operations.py
index c65f7b356274..45673e3ebee1 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/operations/_queue_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/operations/_queue_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._queue_operations import (
     build_create_request,
     build_delete_request,
@@ -41,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]]
 
@@ -166,7 +163,7 @@ async def create(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.StorageQueue
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -201,7 +198,6 @@ async def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -216,7 +212,7 @@ async def create(
             error = self._deserialize.failsafe_deserialize(_models.CloudErrorAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageQueue", pipeline_response)
+        deserialized = self._deserialize("StorageQueue", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -323,7 +319,7 @@ async def update(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.StorageQueue
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -358,7 +354,6 @@ async def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -373,7 +368,7 @@ async def update(
             error = self._deserialize.failsafe_deserialize(_models.CloudErrorAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageQueue", pipeline_response)
+        deserialized = self._deserialize("StorageQueue", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -402,7 +397,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.StorageQueue
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -425,7 +420,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -440,7 +434,7 @@ async def get(
             error = self._deserialize.failsafe_deserialize(_models.CloudErrorAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageQueue", pipeline_response)
+        deserialized = self._deserialize("StorageQueue", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -448,9 +442,7 @@ async def get(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, queue_name: str, **kwargs: Any
-    ) -> None:
+    async def delete(self, resource_group_name: str, account_name: str, queue_name: str, **kwargs: Any) -> None:
         """Deletes the queue with the specified queue name, under the specified account if it exists.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -469,7 +461,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,
@@ -492,7 +484,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -545,7 +536,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-04-01"))
         cls: ClsType[_models.ListQueueResource] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -566,7 +557,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -582,7 +572,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/operations/_queue_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/operations/_queue_services_operations.py
index fbdd93a3acba..25501959ea63 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/operations/_queue_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/operations/_queue_services_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,
@@ -19,14 +18,12 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._queue_services_operations import (
     build_get_service_properties_request,
     build_list_request,
@@ -36,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]]
 
@@ -76,7 +73,7 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.ListQueueServices
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -98,7 +95,6 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -113,7 +109,7 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
             error = self._deserialize.failsafe_deserialize(_models.CloudErrorAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListQueueServices", pipeline_response)
+        deserialized = self._deserialize("ListQueueServices", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -220,7 +216,7 @@ async def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.QueueServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -255,7 +251,6 @@ async def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -270,7 +265,7 @@ async def set_service_properties(
             error = self._deserialize.failsafe_deserialize(_models.CloudErrorAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("QueueServiceProperties", pipeline_response)
+        deserialized = self._deserialize("QueueServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -298,7 +293,7 @@ async def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.QueueServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -321,7 +316,6 @@ async def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -336,7 +330,7 @@ async def get_service_properties(
             error = self._deserialize.failsafe_deserialize(_models.CloudErrorAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("QueueServiceProperties", pipeline_response)
+        deserialized = self._deserialize("QueueServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/operations/_skus_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/operations/_skus_operations.py
index 4dc0cc326178..88319083b680 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/operations/_skus_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/operations/_skus_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
@@ -20,20 +19,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._skus_operations import build_list_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
 
@@ -73,7 +70,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.SkuInformation"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-04-01"))
         cls: ClsType[_models.StorageSkuListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -90,7 +87,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -106,7 +102,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/operations/_storage_accounts_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/operations/_storage_accounts_operations.py
index 3e14cf8091b8..91e5573d8551 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/operations/_storage_accounts_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/operations/_storage_accounts_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,20 @@
 # --------------------------------------------------------------------------
 from io import IOBase
 import sys
-from typing import Any, AsyncIterable, Callable, Dict, IO, Literal, Optional, Type, TypeVar, Union, cast, overload
+from typing import (
+    Any,
+    AsyncIterable,
+    AsyncIterator,
+    Callable,
+    Dict,
+    IO,
+    Literal,
+    Optional,
+    TypeVar,
+    Union,
+    cast,
+    overload,
+)
 import urllib.parse
 
 from azure.core.async_paging import AsyncItemPaged, AsyncList
@@ -18,12 +31,13 @@
     ResourceExistsError,
     ResourceNotFoundError,
     ResourceNotModifiedError,
+    StreamClosedError,
+    StreamConsumedError,
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
 from azure.core.polling import AsyncLROPoller, AsyncNoPolling, AsyncPollingMethod
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
@@ -31,7 +45,6 @@
 from azure.mgmt.core.polling.async_arm_polling import AsyncARMPolling
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._storage_accounts_operations import (
     build_check_name_availability_request,
     build_create_request,
@@ -52,7 +65,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]]
 
@@ -135,7 +148,7 @@ async def check_name_availability(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.CheckNameAvailabilityResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -167,7 +180,6 @@ async def check_name_availability(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -181,7 +193,7 @@ async def check_name_availability(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response)
+        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -194,8 +206,8 @@ async def _create_initial(
         account_name: str,
         parameters: Union[_models.StorageAccountCreateParameters, IO[bytes]],
         **kwargs: Any
-    ) -> Optional[_models.StorageAccount]:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -208,7 +220,7 @@ async def _create_initial(
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-04-01"))
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
-        cls: ClsType[Optional[_models.StorageAccount]] = kwargs.pop("cls", None)
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
         _json = None
@@ -229,10 +241,10 @@ async def _create_initial(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -240,12 +252,14 @@ async def _create_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = None
-        if response.status_code == 200:
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -371,10 +385,11 @@ async def begin_create(
                 params=_params,
                 **kwargs
             )
+            await raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+            deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
             if cls:
                 return cls(pipeline_response, deserialized, {})  # type: ignore
             return deserialized
@@ -397,9 +412,7 @@ def get_long_running_output(pipeline_response):
         )
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, **kwargs: Any
-    ) -> None:
+    async def delete(self, resource_group_name: str, account_name: str, **kwargs: Any) -> None:
         """Deletes a storage account in Microsoft Azure.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -413,7 +426,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,
@@ -435,7 +448,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -480,7 +492,7 @@ async def get_properties(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -503,7 +515,6 @@ async def get_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -517,7 +528,7 @@ async def get_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -628,7 +639,7 @@ async def update(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -662,7 +673,6 @@ async def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -676,7 +686,7 @@ async def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -699,7 +709,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.StorageAccount"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-04-01"))
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -716,7 +726,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -732,7 +741,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -782,7 +790,7 @@ def list_by_resource_group(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-04-01"))
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -800,7 +808,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -816,7 +823,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -866,7 +872,7 @@ async def list_keys(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.StorageAccountListKeysResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -889,7 +895,6 @@ async def list_keys(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -903,7 +908,7 @@ async def list_keys(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response)
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -997,7 +1002,7 @@ async def regenerate_key(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.StorageAccountListKeysResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1031,7 +1036,6 @@ async def regenerate_key(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1045,7 +1049,7 @@ async def regenerate_key(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response)
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1136,7 +1140,7 @@ async def list_account_sas(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.ListAccountSasResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1170,7 +1174,6 @@ async def list_account_sas(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1184,7 +1187,7 @@ async def list_account_sas(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListAccountSasResponse", pipeline_response)
+        deserialized = self._deserialize("ListAccountSasResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1273,7 +1276,7 @@ async def list_service_sas(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.ListServiceSasResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1307,7 +1310,6 @@ async def list_service_sas(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1321,17 +1323,17 @@ async def list_service_sas(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListServiceSasResponse", pipeline_response)
+        deserialized = self._deserialize("ListServiceSasResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
 
         return deserialized  # type: ignore
 
-    async def _failover_initial(  # pylint: disable=inconsistent-return-statements
+    async def _failover_initial(
         self, resource_group_name: str, account_name: str, **kwargs: Any
-    ) -> None:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1343,7 +1345,7 @@ async def _failover_initial(  # pylint: disable=inconsistent-return-statements
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-04-01"))
-        cls: ClsType[None] = kwargs.pop("cls", None)
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
 
         _request = build_failover_request(
             resource_group_name=resource_group_name,
@@ -1353,10 +1355,10 @@ async def _failover_initial(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -1364,11 +1366,19 @@ async def _failover_initial(  # pylint: disable=inconsistent-return-statements
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
-            return cls(pipeline_response, None, {})  # type: ignore
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
 
     @distributed_trace_async
     async def begin_failover(self, resource_group_name: str, account_name: str, **kwargs: Any) -> AsyncLROPoller[None]:
@@ -1396,7 +1406,7 @@ async def begin_failover(self, resource_group_name: str, account_name: str, **kw
         lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
         cont_token: Optional[str] = kwargs.pop("continuation_token", None)
         if cont_token is None:
-            raw_result = await self._failover_initial(  # type: ignore
+            raw_result = await self._failover_initial(
                 resource_group_name=resource_group_name,
                 account_name=account_name,
                 api_version=api_version,
@@ -1405,6 +1415,7 @@ async def begin_failover(self, resource_group_name: str, account_name: str, **kw
                 params=_params,
                 **kwargs
             )
+            await raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
@@ -1434,8 +1445,8 @@ async def _restore_blob_ranges_initial(
         account_name: str,
         parameters: Union[_models.BlobRestoreParameters, IO[bytes]],
         **kwargs: Any
-    ) -> _models.BlobRestoreStatus:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1448,7 +1459,7 @@ async def _restore_blob_ranges_initial(
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-04-01"))
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
-        cls: ClsType[_models.BlobRestoreStatus] = kwargs.pop("cls", None)
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
         _json = None
@@ -1469,10 +1480,10 @@ async def _restore_blob_ranges_initial(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -1480,14 +1491,14 @@ async def _restore_blob_ranges_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response)
-
-        if response.status_code == 202:
-            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response)
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1603,10 +1614,11 @@ async def begin_restore_blob_ranges(
                 params=_params,
                 **kwargs
             )
+            await raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):
-            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response)
+            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response.http_response)
             if cls:
                 return cls(pipeline_response, deserialized, {})  # type: ignore
             return deserialized
@@ -1631,9 +1643,7 @@ def get_long_running_output(pipeline_response):
         )
 
     @distributed_trace_async
-    async def revoke_user_delegation_keys(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, **kwargs: Any
-    ) -> None:
+    async def revoke_user_delegation_keys(self, resource_group_name: str, account_name: str, **kwargs: Any) -> None:
         """Revoke user delegation keys.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -1647,7 +1657,7 @@ async def revoke_user_delegation_keys(  # pylint: disable=inconsistent-return-st
         :rtype: None
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1669,7 +1679,6 @@ async def revoke_user_delegation_keys(  # pylint: disable=inconsistent-return-st
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/operations/_table_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/operations/_table_operations.py
index 8c70ea53523c..0bf7e27c0d4a 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/operations/_table_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/operations/_table_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
@@ -20,15 +19,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._table_operations import (
     build_create_request,
     build_delete_request,
@@ -40,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]]
 
@@ -86,7 +83,7 @@ async def create(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.Table
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -109,7 +106,6 @@ async def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -124,7 +120,7 @@ async def create(
             error = self._deserialize.failsafe_deserialize(_models.CloudErrorAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("Table", pipeline_response)
+        deserialized = self._deserialize("Table", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -152,7 +148,7 @@ async def update(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.Table
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -175,7 +171,6 @@ async def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -190,7 +185,7 @@ async def update(
             error = self._deserialize.failsafe_deserialize(_models.CloudErrorAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("Table", pipeline_response)
+        deserialized = self._deserialize("Table", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -216,7 +211,7 @@ async def get(self, resource_group_name: str, account_name: str, table_name: str
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.Table
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -239,7 +234,6 @@ async def get(self, resource_group_name: str, account_name: str, table_name: str
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -254,7 +248,7 @@ async def get(self, resource_group_name: str, account_name: str, table_name: str
             error = self._deserialize.failsafe_deserialize(_models.CloudErrorAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("Table", pipeline_response)
+        deserialized = self._deserialize("Table", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -262,9 +256,7 @@ async def get(self, resource_group_name: str, account_name: str, table_name: str
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, table_name: str, **kwargs: Any
-    ) -> None:
+    async def delete(self, resource_group_name: str, account_name: str, table_name: str, **kwargs: Any) -> None:
         """Deletes the table with the specified table name, under the specified account if it exists.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -282,7 +274,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,
@@ -305,7 +297,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -344,7 +335,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> As
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-04-01"))
         cls: ClsType[_models.ListTableResource] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -363,7 +354,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -379,7 +369,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/operations/_table_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/operations/_table_services_operations.py
index 049f361e72da..bbd7ce35bf9d 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/operations/_table_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/operations/_table_services_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,
@@ -19,14 +18,12 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._table_services_operations import (
     build_get_service_properties_request,
     build_list_request,
@@ -36,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]]
 
@@ -76,7 +73,7 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.ListTableServices
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -98,7 +95,6 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -113,7 +109,7 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
             error = self._deserialize.failsafe_deserialize(_models.CloudErrorAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListTableServices", pipeline_response)
+        deserialized = self._deserialize("ListTableServices", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -220,7 +216,7 @@ async def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.TableServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -255,7 +251,6 @@ async def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -270,7 +265,7 @@ async def set_service_properties(
             error = self._deserialize.failsafe_deserialize(_models.CloudErrorAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("TableServiceProperties", pipeline_response)
+        deserialized = self._deserialize("TableServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -298,7 +293,7 @@ async def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.TableServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -321,7 +316,6 @@ async def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -336,7 +330,7 @@ async def get_service_properties(
             error = self._deserialize.failsafe_deserialize(_models.CloudErrorAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("TableServiceProperties", pipeline_response)
+        deserialized = self._deserialize("TableServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/operations/_usages_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/operations/_usages_operations.py
index d0add84a4fef..baafdc5aeaf6 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/operations/_usages_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/aio/operations/_usages_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
@@ -20,20 +19,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._usages_operations import build_list_by_location_request
 
 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 +72,7 @@ def list_by_location(self, location: str, **kwargs: Any) -> AsyncIterable["_mode
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-04-01"))
         cls: ClsType[_models.UsageListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -93,7 +90,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -109,7 +105,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/models/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/models/__init__.py
index e3653d567e9d..5ffd64373563 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/models/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/models/__init__.py
@@ -5,207 +5,218 @@
 # 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 AccessPolicy
-from ._models_py3 import AccountSasParameters
-from ._models_py3 import ActiveDirectoryProperties
-from ._models_py3 import AzureEntityResource
-from ._models_py3 import AzureFilesIdentityBasedAuthentication
-from ._models_py3 import BlobContainer
-from ._models_py3 import BlobInventoryPolicy
-from ._models_py3 import BlobInventoryPolicyDefinition
-from ._models_py3 import BlobInventoryPolicyFilter
-from ._models_py3 import BlobInventoryPolicyRule
-from ._models_py3 import BlobInventoryPolicySchema
-from ._models_py3 import BlobRestoreParameters
-from ._models_py3 import BlobRestoreRange
-from ._models_py3 import BlobRestoreStatus
-from ._models_py3 import BlobServiceItems
-from ._models_py3 import BlobServiceProperties
-from ._models_py3 import ChangeFeed
-from ._models_py3 import CheckNameAvailabilityResult
-from ._models_py3 import CloudErrorAutoGenerated
-from ._models_py3 import CloudErrorBody
-from ._models_py3 import CloudErrorBodyAutoGenerated
-from ._models_py3 import CorsRule
-from ._models_py3 import CorsRules
-from ._models_py3 import CustomDomain
-from ._models_py3 import DateAfterCreation
-from ._models_py3 import DateAfterModification
-from ._models_py3 import DeleteRetentionPolicy
-from ._models_py3 import DeletedAccount
-from ._models_py3 import DeletedAccountListResult
-from ._models_py3 import DeletedShare
-from ._models_py3 import Dimension
-from ._models_py3 import Encryption
-from ._models_py3 import EncryptionIdentity
-from ._models_py3 import EncryptionScope
-from ._models_py3 import EncryptionScopeKeyVaultProperties
-from ._models_py3 import EncryptionScopeListResult
-from ._models_py3 import EncryptionService
-from ._models_py3 import EncryptionServices
-from ._models_py3 import Endpoints
-from ._models_py3 import ErrorResponse
-from ._models_py3 import ErrorResponseBody
-from ._models_py3 import ExtendedLocation
-from ._models_py3 import FileServiceItems
-from ._models_py3 import FileServiceProperties
-from ._models_py3 import FileShare
-from ._models_py3 import FileShareItem
-from ._models_py3 import FileShareItems
-from ._models_py3 import GeoReplicationStats
-from ._models_py3 import IPRule
-from ._models_py3 import Identity
-from ._models_py3 import ImmutabilityPolicy
-from ._models_py3 import ImmutabilityPolicyProperties
-from ._models_py3 import ImmutableStorageWithVersioning
-from ._models_py3 import KeyCreationTime
-from ._models_py3 import KeyPolicy
-from ._models_py3 import KeyVaultProperties
-from ._models_py3 import LastAccessTimeTrackingPolicy
-from ._models_py3 import LeaseContainerRequest
-from ._models_py3 import LeaseContainerResponse
-from ._models_py3 import LeaseShareRequest
-from ._models_py3 import LeaseShareResponse
-from ._models_py3 import LegalHold
-from ._models_py3 import LegalHoldProperties
-from ._models_py3 import ListAccountSasResponse
-from ._models_py3 import ListBlobInventoryPolicy
-from ._models_py3 import ListContainerItem
-from ._models_py3 import ListContainerItems
-from ._models_py3 import ListQueue
-from ._models_py3 import ListQueueResource
-from ._models_py3 import ListQueueServices
-from ._models_py3 import ListServiceSasResponse
-from ._models_py3 import ListTableResource
-from ._models_py3 import ListTableServices
-from ._models_py3 import ManagementPolicy
-from ._models_py3 import ManagementPolicyAction
-from ._models_py3 import ManagementPolicyBaseBlob
-from ._models_py3 import ManagementPolicyDefinition
-from ._models_py3 import ManagementPolicyFilter
-from ._models_py3 import ManagementPolicyRule
-from ._models_py3 import ManagementPolicySchema
-from ._models_py3 import ManagementPolicySnapShot
-from ._models_py3 import ManagementPolicyVersion
-from ._models_py3 import MetricSpecification
-from ._models_py3 import Multichannel
-from ._models_py3 import NetworkRuleSet
-from ._models_py3 import ObjectReplicationPolicies
-from ._models_py3 import ObjectReplicationPolicy
-from ._models_py3 import ObjectReplicationPolicyFilter
-from ._models_py3 import ObjectReplicationPolicyRule
-from ._models_py3 import Operation
-from ._models_py3 import OperationDisplay
-from ._models_py3 import OperationListResult
-from ._models_py3 import PrivateEndpoint
-from ._models_py3 import PrivateEndpointConnection
-from ._models_py3 import PrivateEndpointConnectionListResult
-from ._models_py3 import PrivateLinkResource
-from ._models_py3 import PrivateLinkResourceListResult
-from ._models_py3 import PrivateLinkServiceConnectionState
-from ._models_py3 import ProtocolSettings
-from ._models_py3 import ProxyResource
-from ._models_py3 import QueueServiceProperties
-from ._models_py3 import Resource
-from ._models_py3 import ResourceAccessRule
-from ._models_py3 import RestorePolicyProperties
-from ._models_py3 import Restriction
-from ._models_py3 import RoutingPreference
-from ._models_py3 import SKUCapability
-from ._models_py3 import SasPolicy
-from ._models_py3 import ServiceSasParameters
-from ._models_py3 import ServiceSpecification
-from ._models_py3 import SignedIdentifier
-from ._models_py3 import Sku
-from ._models_py3 import SkuInformation
-from ._models_py3 import SmbSetting
-from ._models_py3 import StorageAccount
-from ._models_py3 import StorageAccountCheckNameAvailabilityParameters
-from ._models_py3 import StorageAccountCreateParameters
-from ._models_py3 import StorageAccountInternetEndpoints
-from ._models_py3 import StorageAccountKey
-from ._models_py3 import StorageAccountListKeysResult
-from ._models_py3 import StorageAccountListResult
-from ._models_py3 import StorageAccountMicrosoftEndpoints
-from ._models_py3 import StorageAccountRegenerateKeyParameters
-from ._models_py3 import StorageAccountUpdateParameters
-from ._models_py3 import StorageQueue
-from ._models_py3 import StorageSkuListResult
-from ._models_py3 import SystemData
-from ._models_py3 import Table
-from ._models_py3 import TableServiceProperties
-from ._models_py3 import TagFilter
-from ._models_py3 import TagProperty
-from ._models_py3 import TrackedResource
-from ._models_py3 import UpdateHistoryProperty
-from ._models_py3 import Usage
-from ._models_py3 import UsageListResult
-from ._models_py3 import UsageName
-from ._models_py3 import UserAssignedIdentity
-from ._models_py3 import VirtualNetworkRule
+from typing import TYPE_CHECKING
 
-from ._storage_management_client_enums import AccessTier
-from ._storage_management_client_enums import AccountStatus
-from ._storage_management_client_enums import BlobInventoryPolicyName
-from ._storage_management_client_enums import BlobRestoreProgressStatus
-from ._storage_management_client_enums import Bypass
-from ._storage_management_client_enums import CorsRuleAllowedMethodsItem
-from ._storage_management_client_enums import CreatedByType
-from ._storage_management_client_enums import DefaultAction
-from ._storage_management_client_enums import DefaultSharePermission
-from ._storage_management_client_enums import DirectoryServiceOptions
-from ._storage_management_client_enums import EnabledProtocols
-from ._storage_management_client_enums import EncryptionScopeSource
-from ._storage_management_client_enums import EncryptionScopeState
-from ._storage_management_client_enums import Enum35
-from ._storage_management_client_enums import ExpirationAction
-from ._storage_management_client_enums import ExtendedLocationTypes
-from ._storage_management_client_enums import Format
-from ._storage_management_client_enums import GeoReplicationStatus
-from ._storage_management_client_enums import HttpProtocol
-from ._storage_management_client_enums import IdentityType
-from ._storage_management_client_enums import ImmutabilityPolicyState
-from ._storage_management_client_enums import ImmutabilityPolicyUpdateType
-from ._storage_management_client_enums import InventoryRuleType
-from ._storage_management_client_enums import KeyPermission
-from ._storage_management_client_enums import KeySource
-from ._storage_management_client_enums import KeyType
-from ._storage_management_client_enums import Kind
-from ._storage_management_client_enums import LargeFileSharesState
-from ._storage_management_client_enums import LeaseContainerRequestAction
-from ._storage_management_client_enums import LeaseDuration
-from ._storage_management_client_enums import LeaseShareAction
-from ._storage_management_client_enums import LeaseState
-from ._storage_management_client_enums import LeaseStatus
-from ._storage_management_client_enums import ListContainersInclude
-from ._storage_management_client_enums import ManagementPolicyName
-from ._storage_management_client_enums import MigrationState
-from ._storage_management_client_enums import MinimumTlsVersion
-from ._storage_management_client_enums import Name
-from ._storage_management_client_enums import ObjectType
-from ._storage_management_client_enums import Permissions
-from ._storage_management_client_enums import PrivateEndpointConnectionProvisioningState
-from ._storage_management_client_enums import PrivateEndpointServiceConnectionStatus
-from ._storage_management_client_enums import ProvisioningState
-from ._storage_management_client_enums import PublicAccess
-from ._storage_management_client_enums import Reason
-from ._storage_management_client_enums import ReasonCode
-from ._storage_management_client_enums import RootSquashType
-from ._storage_management_client_enums import RoutingChoice
-from ._storage_management_client_enums import RuleType
-from ._storage_management_client_enums import Schedule
-from ._storage_management_client_enums import Services
-from ._storage_management_client_enums import ShareAccessTier
-from ._storage_management_client_enums import SignedResource
-from ._storage_management_client_enums import SignedResourceTypes
-from ._storage_management_client_enums import SkuName
-from ._storage_management_client_enums import SkuTier
-from ._storage_management_client_enums import State
-from ._storage_management_client_enums import StorageAccountExpand
-from ._storage_management_client_enums import UsageUnit
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+
+from ._models_py3 import (  # type: ignore
+    AccessPolicy,
+    AccountSasParameters,
+    ActiveDirectoryProperties,
+    AzureEntityResource,
+    AzureFilesIdentityBasedAuthentication,
+    BlobContainer,
+    BlobInventoryPolicy,
+    BlobInventoryPolicyDefinition,
+    BlobInventoryPolicyFilter,
+    BlobInventoryPolicyRule,
+    BlobInventoryPolicySchema,
+    BlobRestoreParameters,
+    BlobRestoreRange,
+    BlobRestoreStatus,
+    BlobServiceItems,
+    BlobServiceProperties,
+    ChangeFeed,
+    CheckNameAvailabilityResult,
+    CloudErrorAutoGenerated,
+    CloudErrorBody,
+    CloudErrorBodyAutoGenerated,
+    CorsRule,
+    CorsRules,
+    CustomDomain,
+    DateAfterCreation,
+    DateAfterModification,
+    DeleteRetentionPolicy,
+    DeletedAccount,
+    DeletedAccountListResult,
+    DeletedShare,
+    Dimension,
+    Encryption,
+    EncryptionIdentity,
+    EncryptionScope,
+    EncryptionScopeKeyVaultProperties,
+    EncryptionScopeListResult,
+    EncryptionService,
+    EncryptionServices,
+    Endpoints,
+    ErrorResponse,
+    ErrorResponseBody,
+    ExtendedLocation,
+    FileServiceItems,
+    FileServiceProperties,
+    FileShare,
+    FileShareItem,
+    FileShareItems,
+    GeoReplicationStats,
+    IPRule,
+    Identity,
+    ImmutabilityPolicy,
+    ImmutabilityPolicyProperties,
+    ImmutableStorageWithVersioning,
+    KeyCreationTime,
+    KeyPolicy,
+    KeyVaultProperties,
+    LastAccessTimeTrackingPolicy,
+    LeaseContainerRequest,
+    LeaseContainerResponse,
+    LeaseShareRequest,
+    LeaseShareResponse,
+    LegalHold,
+    LegalHoldProperties,
+    ListAccountSasResponse,
+    ListBlobInventoryPolicy,
+    ListContainerItem,
+    ListContainerItems,
+    ListQueue,
+    ListQueueResource,
+    ListQueueServices,
+    ListServiceSasResponse,
+    ListTableResource,
+    ListTableServices,
+    ManagementPolicy,
+    ManagementPolicyAction,
+    ManagementPolicyBaseBlob,
+    ManagementPolicyDefinition,
+    ManagementPolicyFilter,
+    ManagementPolicyRule,
+    ManagementPolicySchema,
+    ManagementPolicySnapShot,
+    ManagementPolicyVersion,
+    MetricSpecification,
+    Multichannel,
+    NetworkRuleSet,
+    ObjectReplicationPolicies,
+    ObjectReplicationPolicy,
+    ObjectReplicationPolicyFilter,
+    ObjectReplicationPolicyRule,
+    Operation,
+    OperationDisplay,
+    OperationListResult,
+    PrivateEndpoint,
+    PrivateEndpointConnection,
+    PrivateEndpointConnectionListResult,
+    PrivateLinkResource,
+    PrivateLinkResourceListResult,
+    PrivateLinkServiceConnectionState,
+    ProtocolSettings,
+    ProxyResource,
+    QueueServiceProperties,
+    Resource,
+    ResourceAccessRule,
+    RestorePolicyProperties,
+    Restriction,
+    RoutingPreference,
+    SKUCapability,
+    SasPolicy,
+    ServiceSasParameters,
+    ServiceSpecification,
+    SignedIdentifier,
+    Sku,
+    SkuInformation,
+    SmbSetting,
+    StorageAccount,
+    StorageAccountCheckNameAvailabilityParameters,
+    StorageAccountCreateParameters,
+    StorageAccountInternetEndpoints,
+    StorageAccountKey,
+    StorageAccountListKeysResult,
+    StorageAccountListResult,
+    StorageAccountMicrosoftEndpoints,
+    StorageAccountRegenerateKeyParameters,
+    StorageAccountUpdateParameters,
+    StorageQueue,
+    StorageSkuListResult,
+    SystemData,
+    Table,
+    TableServiceProperties,
+    TagFilter,
+    TagProperty,
+    TrackedResource,
+    UpdateHistoryProperty,
+    Usage,
+    UsageListResult,
+    UsageName,
+    UserAssignedIdentity,
+    VirtualNetworkRule,
+)
+
+from ._storage_management_client_enums import (  # type: ignore
+    AccessTier,
+    AccountStatus,
+    BlobInventoryPolicyName,
+    BlobRestoreProgressStatus,
+    Bypass,
+    CorsRuleAllowedMethodsItem,
+    CreatedByType,
+    DefaultAction,
+    DefaultSharePermission,
+    DirectoryServiceOptions,
+    EnabledProtocols,
+    EncryptionScopeSource,
+    EncryptionScopeState,
+    Enum35,
+    ExpirationAction,
+    ExtendedLocationTypes,
+    Format,
+    GeoReplicationStatus,
+    HttpProtocol,
+    IdentityType,
+    ImmutabilityPolicyState,
+    ImmutabilityPolicyUpdateType,
+    InventoryRuleType,
+    KeyPermission,
+    KeySource,
+    KeyType,
+    Kind,
+    LargeFileSharesState,
+    LeaseContainerRequestAction,
+    LeaseDuration,
+    LeaseShareAction,
+    LeaseState,
+    LeaseStatus,
+    ListContainersInclude,
+    ManagementPolicyName,
+    MigrationState,
+    MinimumTlsVersion,
+    Name,
+    ObjectType,
+    Permissions,
+    PrivateEndpointConnectionProvisioningState,
+    PrivateEndpointServiceConnectionStatus,
+    ProvisioningState,
+    PublicAccess,
+    Reason,
+    ReasonCode,
+    RootSquashType,
+    RoutingChoice,
+    RuleType,
+    Schedule,
+    Services,
+    ShareAccessTier,
+    SignedResource,
+    SignedResourceTypes,
+    SkuName,
+    SkuTier,
+    State,
+    StorageAccountExpand,
+    UsageUnit,
+)
 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__ = [
@@ -407,5 +418,5 @@
     "StorageAccountExpand",
     "UsageUnit",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/models/_models_py3.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/models/_models_py3.py
index 3a8dd1e4ad41..fbb947aa2612 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/models/_models_py3.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/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
 
 
@@ -363,7 +362,7 @@ def __init__(
         self.default_share_permission = default_share_permission
 
 
-class BlobContainer(AzureEntityResource):  # pylint: disable=too-many-instance-attributes
+class BlobContainer(AzureEntityResource):
     """Properties of the blob container, including Id, resource name, resource type, Etag.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -962,7 +961,7 @@ def __init__(self, **kwargs: Any) -> None:
         self.value = None
 
 
-class BlobServiceProperties(Resource):  # pylint: disable=too-many-instance-attributes
+class BlobServiceProperties(Resource):
     """The properties of a storage account’s Blob service.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -2278,7 +2277,7 @@ def __init__(
         self.protocol_settings = protocol_settings
 
 
-class FileShare(AzureEntityResource):  # pylint: disable=too-many-instance-attributes
+class FileShare(AzureEntityResource):
     """Properties of the file share, including Id, resource name, resource type, Etag.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -2436,7 +2435,7 @@ def __init__(
         self.snapshot_time = None
 
 
-class FileShareItem(AzureEntityResource):  # pylint: disable=too-many-instance-attributes
+class FileShareItem(AzureEntityResource):
     """The file share properties be listed out.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -3112,7 +3111,7 @@ class LeaseContainerRequest(_serialization.Model):
     All required parameters must be populated in order to send to server.
 
     :ivar action: Specifies the lease action. Can be one of the available actions. Required. Known
-     values are: "Acquire", "Renew", "Change", "Release", and "Break".
+     values are: "Acquire", "Renew", "Change", "Release", "Break", and "Break".
     :vartype action: str or ~azure.mgmt.storage.v2021_04_01.models.LeaseContainerRequestAction
     :ivar lease_id: Identifies the lease. Can be specified in any valid GUID string format.
     :vartype lease_id: str
@@ -3151,7 +3150,7 @@ def __init__(
     ) -> None:
         """
         :keyword action: Specifies the lease action. Can be one of the available actions. Required.
-         Known values are: "Acquire", "Renew", "Change", "Release", and "Break".
+         Known values are: "Acquire", "Renew", "Change", "Release", "Break", and "Break".
         :paramtype action: str or ~azure.mgmt.storage.v2021_04_01.models.LeaseContainerRequestAction
         :keyword lease_id: Identifies the lease. Can be specified in any valid GUID string format.
         :paramtype lease_id: str
@@ -3209,7 +3208,7 @@ class LeaseShareRequest(_serialization.Model):
     All required parameters must be populated in order to send to server.
 
     :ivar action: Specifies the lease action. Can be one of the available actions. Required. Known
-     values are: "Acquire", "Renew", "Change", "Release", and "Break".
+     values are: "Acquire", "Renew", "Change", "Release", "Break", and "Break".
     :vartype action: str or ~azure.mgmt.storage.v2021_04_01.models.LeaseShareAction
     :ivar lease_id: Identifies the lease. Can be specified in any valid GUID string format.
     :vartype lease_id: str
@@ -3248,7 +3247,7 @@ def __init__(
     ) -> None:
         """
         :keyword action: Specifies the lease action. Can be one of the available actions. Required.
-         Known values are: "Acquire", "Renew", "Change", "Release", and "Break".
+         Known values are: "Acquire", "Renew", "Change", "Release", "Break", and "Break".
         :paramtype action: str or ~azure.mgmt.storage.v2021_04_01.models.LeaseShareAction
         :keyword lease_id: Identifies the lease. Can be specified in any valid GUID string format.
         :paramtype lease_id: str
@@ -3417,7 +3416,7 @@ def __init__(self, **kwargs: Any) -> None:
         self.value = None
 
 
-class ListContainerItem(AzureEntityResource):  # pylint: disable=too-many-instance-attributes
+class ListContainerItem(AzureEntityResource):
     """The blob container properties be listed out.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -5122,7 +5121,7 @@ def __init__(
         self.expiration_action = expiration_action
 
 
-class ServiceSasParameters(_serialization.Model):  # pylint: disable=too-many-instance-attributes
+class ServiceSasParameters(_serialization.Model):
     """The parameters to list service SAS credentials of a specific resource.
 
     All required parameters must be populated in order to send to server.
@@ -5600,7 +5599,7 @@ def __init__(self, *, location: str, tags: Optional[Dict[str, str]] = None, **kw
         self.location = location
 
 
-class StorageAccount(TrackedResource):  # pylint: disable=too-many-instance-attributes
+class StorageAccount(TrackedResource):
     """The storage account.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -5930,7 +5929,7 @@ def __init__(self, *, name: str, **kwargs: Any) -> None:
         self.name = name
 
 
-class StorageAccountCreateParameters(_serialization.Model):  # pylint: disable=too-many-instance-attributes
+class StorageAccountCreateParameters(_serialization.Model):
     """The parameters used when creating a storage account.
 
     All required parameters must be populated in order to send to server.
@@ -6373,7 +6372,7 @@ def __init__(self, *, key_name: str, **kwargs: Any) -> None:
         self.key_name = key_name
 
 
-class StorageAccountUpdateParameters(_serialization.Model):  # pylint: disable=too-many-instance-attributes
+class StorageAccountUpdateParameters(_serialization.Model):
     """The parameters that can be provided when updating the storage account properties.
 
     :ivar sku: Gets or sets the SKU name. Note that the SKU name cannot be updated to Standard_ZRS,
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/models/_storage_management_client_enums.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/models/_storage_management_client_enums.py
index 309f0b395d32..094c9006d1d1 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/models/_storage_management_client_enums.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/models/_storage_management_client_enums.py
@@ -253,6 +253,7 @@ class LeaseContainerRequestAction(str, Enum, metaclass=CaseInsensitiveEnumMeta):
     RENEW = "Renew"
     CHANGE = "Change"
     RELEASE = "Release"
+    BREAK = "Break"
     BREAK_ENUM = "Break"
 
 
@@ -272,6 +273,7 @@ class LeaseShareAction(str, Enum, metaclass=CaseInsensitiveEnumMeta):
     RENEW = "Renew"
     CHANGE = "Change"
     RELEASE = "Release"
+    BREAK = "Break"
     BREAK_ENUM = "Break"
 
 
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/operations/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/operations/__init__.py
index 0f201012e160..d406c5bf4d6b 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/operations/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/operations/__init__.py
@@ -5,29 +5,35 @@
 # 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 ._skus_operations import SkusOperations
-from ._storage_accounts_operations import StorageAccountsOperations
-from ._deleted_accounts_operations import DeletedAccountsOperations
-from ._usages_operations import UsagesOperations
-from ._management_policies_operations import ManagementPoliciesOperations
-from ._blob_inventory_policies_operations import BlobInventoryPoliciesOperations
-from ._private_endpoint_connections_operations import PrivateEndpointConnectionsOperations
-from ._private_link_resources_operations import PrivateLinkResourcesOperations
-from ._object_replication_policies_operations import ObjectReplicationPoliciesOperations
-from ._encryption_scopes_operations import EncryptionScopesOperations
-from ._blob_services_operations import BlobServicesOperations
-from ._blob_containers_operations import BlobContainersOperations
-from ._file_services_operations import FileServicesOperations
-from ._file_shares_operations import FileSharesOperations
-from ._queue_services_operations import QueueServicesOperations
-from ._queue_operations import QueueOperations
-from ._table_services_operations import TableServicesOperations
-from ._table_operations import TableOperations
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._operations import Operations  # type: ignore
+from ._skus_operations import SkusOperations  # type: ignore
+from ._storage_accounts_operations import StorageAccountsOperations  # type: ignore
+from ._deleted_accounts_operations import DeletedAccountsOperations  # type: ignore
+from ._usages_operations import UsagesOperations  # type: ignore
+from ._management_policies_operations import ManagementPoliciesOperations  # type: ignore
+from ._blob_inventory_policies_operations import BlobInventoryPoliciesOperations  # type: ignore
+from ._private_endpoint_connections_operations import PrivateEndpointConnectionsOperations  # type: ignore
+from ._private_link_resources_operations import PrivateLinkResourcesOperations  # type: ignore
+from ._object_replication_policies_operations import ObjectReplicationPoliciesOperations  # type: ignore
+from ._encryption_scopes_operations import EncryptionScopesOperations  # type: ignore
+from ._blob_services_operations import BlobServicesOperations  # type: ignore
+from ._blob_containers_operations import BlobContainersOperations  # type: ignore
+from ._file_services_operations import FileServicesOperations  # type: ignore
+from ._file_shares_operations import FileSharesOperations  # type: ignore
+from ._queue_services_operations import QueueServicesOperations  # type: ignore
+from ._queue_operations import QueueOperations  # type: ignore
+from ._table_services_operations import TableServicesOperations  # type: ignore
+from ._table_operations import TableOperations  # 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__ = [
@@ -51,5 +57,5 @@
     "TableServicesOperations",
     "TableOperations",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/operations/_blob_containers_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/operations/_blob_containers_operations.py
index 9c68296ffd8d..975e334dd33b 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/operations/_blob_containers_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/operations/_blob_containers_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,7 @@
 # --------------------------------------------------------------------------
 from io import IOBase
 import sys
-from typing import Any, Callable, Dict, IO, Iterable, 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 (
@@ -17,13 +17,14 @@
     ResourceExistsError,
     ResourceNotFoundError,
     ResourceNotModifiedError,
+    StreamClosedError,
+    StreamConsumedError,
     map_error,
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
 from azure.core.polling import LROPoller, NoPolling, PollingMethod
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
@@ -31,12 +32,11 @@
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -649,7 +649,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-04-01"))
         cls: ClsType[_models.ListContainerItems] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -671,7 +671,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -687,7 +686,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -822,7 +820,7 @@ def create(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -857,7 +855,6 @@ def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -871,11 +868,7 @@ def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("BlobContainer", pipeline_response)
-
-        if response.status_code == 201:
-            deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -985,7 +978,7 @@ def update(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1020,7 +1013,6 @@ def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1034,7 +1026,7 @@ def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1063,7 +1055,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1086,7 +1078,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1100,7 +1091,7 @@ def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1129,7 +1120,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,
@@ -1152,7 +1143,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1275,7 +1265,7 @@ def set_legal_hold(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.LegalHold
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1310,7 +1300,6 @@ def set_legal_hold(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1324,7 +1313,7 @@ def set_legal_hold(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LegalHold", pipeline_response)
+        deserialized = self._deserialize("LegalHold", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1434,7 +1423,7 @@ def clear_legal_hold(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.LegalHold
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1469,7 +1458,6 @@ def clear_legal_hold(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1483,7 +1471,7 @@ def clear_legal_hold(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LegalHold", pipeline_response)
+        deserialized = self._deserialize("LegalHold", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1622,7 +1610,7 @@ def create_or_update_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1662,7 +1650,6 @@ def create_or_update_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1679,7 +1666,7 @@ def create_or_update_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1722,7 +1709,7 @@ def get_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1747,7 +1734,6 @@ def get_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1764,7 +1750,7 @@ def get_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1809,7 +1795,7 @@ def delete_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1834,7 +1820,6 @@ def delete_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1851,7 +1836,7 @@ def delete_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1885,7 +1870,7 @@ def lock_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1909,7 +1894,6 @@ def lock_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1926,7 +1910,7 @@ def lock_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -2056,7 +2040,7 @@ def extend_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -2095,7 +2079,6 @@ def extend_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -2112,7 +2095,7 @@ def extend_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -2222,7 +2205,7 @@ def lease(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.LeaseContainerResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -2260,7 +2243,6 @@ def lease(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -2274,17 +2256,17 @@ def lease(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LeaseContainerResponse", pipeline_response)
+        deserialized = self._deserialize("LeaseContainerResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
 
         return deserialized  # type: ignore
 
-    def _object_level_worm_initial(  # pylint: disable=inconsistent-return-statements
+    def _object_level_worm_initial(
         self, resource_group_name: str, account_name: str, container_name: str, **kwargs: Any
-    ) -> None:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> Iterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -2296,7 +2278,7 @@ def _object_level_worm_initial(  # pylint: disable=inconsistent-return-statement
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-04-01"))
-        cls: ClsType[None] = kwargs.pop("cls", None)
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
 
         _request = build_object_level_worm_request(
             resource_group_name=resource_group_name,
@@ -2307,10 +2289,10 @@ def _object_level_worm_initial(  # pylint: disable=inconsistent-return-statement
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -2318,11 +2300,19 @@ def _object_level_worm_initial(  # pylint: disable=inconsistent-return-statement
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
-            return cls(pipeline_response, None, {})  # type: ignore
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
 
     @distributed_trace
     def begin_object_level_worm(
@@ -2358,7 +2348,7 @@ def begin_object_level_worm(
         lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
         cont_token: Optional[str] = kwargs.pop("continuation_token", None)
         if cont_token is None:
-            raw_result = self._object_level_worm_initial(  # type: ignore
+            raw_result = self._object_level_worm_initial(
                 resource_group_name=resource_group_name,
                 account_name=account_name,
                 container_name=container_name,
@@ -2368,6 +2358,7 @@ def begin_object_level_worm(
                 params=_params,
                 **kwargs
             )
+            raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/operations/_blob_inventory_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/operations/_blob_inventory_policies_operations.py
index fe527ca86bfd..1cabbae98f1a 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/operations/_blob_inventory_policies_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/operations/_blob_inventory_policies_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 (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -235,7 +232,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.BlobInventoryPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -258,7 +255,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -273,7 +269,7 @@ def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response)
+        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -377,7 +373,7 @@ def create_or_update(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.BlobInventoryPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -412,7 +408,6 @@ def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -427,7 +422,7 @@ def create_or_update(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response)
+        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -459,7 +454,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,
@@ -482,7 +477,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -524,7 +518,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-04-01"))
         cls: ClsType[_models.ListBlobInventoryPolicy] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -543,7 +537,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -559,7 +552,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/operations/_blob_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/operations/_blob_services_operations.py
index 20f4c8b363f6..3820f7a6d858 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/operations/_blob_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/operations/_blob_services_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 (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -197,7 +194,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-04-01"))
         cls: ClsType[_models.BlobServiceItems] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -216,7 +213,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -232,7 +228,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -361,7 +356,7 @@ def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.BlobServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -396,7 +391,6 @@ def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -410,7 +404,7 @@ def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobServiceProperties", pipeline_response)
+        deserialized = self._deserialize("BlobServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -438,7 +432,7 @@ def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.BlobServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -461,7 +455,6 @@ def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -475,7 +468,7 @@ def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobServiceProperties", pipeline_response)
+        deserialized = self._deserialize("BlobServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/operations/_deleted_accounts_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/operations/_deleted_accounts_operations.py
index 605a7d468180..44b2780a42cc 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/operations/_deleted_accounts_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/operations/_deleted_accounts_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 (
@@ -20,20 +19,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -130,7 +127,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.DeletedAccount"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-04-01"))
         cls: ClsType[_models.DeletedAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -147,7 +144,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -163,7 +159,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -205,7 +200,7 @@ def get(self, deleted_account_name: str, location: str, **kwargs: Any) -> _model
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.DeletedAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -227,7 +222,6 @@ def get(self, deleted_account_name: str, location: str, **kwargs: Any) -> _model
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -242,7 +236,7 @@ def get(self, deleted_account_name: str, location: str, **kwargs: Any) -> _model
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("DeletedAccount", pipeline_response)
+        deserialized = self._deserialize("DeletedAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/operations/_encryption_scopes_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/operations/_encryption_scopes_operations.py
index f3db7f7ee940..11d1a3a7d990 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/operations/_encryption_scopes_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/operations/_encryption_scopes_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 (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -315,7 +312,7 @@ def put(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.EncryptionScope
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -350,7 +347,6 @@ def put(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -365,11 +361,7 @@ def put(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("EncryptionScope", pipeline_response)
-
-        if response.status_code == 201:
-            deserialized = self._deserialize("EncryptionScope", pipeline_response)
+        deserialized = self._deserialize("EncryptionScope", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -479,7 +471,7 @@ def patch(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.EncryptionScope
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -514,7 +506,6 @@ def patch(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -529,7 +520,7 @@ def patch(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("EncryptionScope", pipeline_response)
+        deserialized = self._deserialize("EncryptionScope", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -558,7 +549,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.EncryptionScope
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -581,7 +572,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -596,7 +586,7 @@ def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("EncryptionScope", pipeline_response)
+        deserialized = self._deserialize("EncryptionScope", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -624,7 +614,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> It
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-04-01"))
         cls: ClsType[_models.EncryptionScopeListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -643,7 +633,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -659,7 +648,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/operations/_file_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/operations/_file_services_operations.py
index dd7a2825356c..fd0a7eda9cfe 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/operations/_file_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/operations/_file_services_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,
@@ -19,20 +18,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -185,7 +182,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.FileServiceItems
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -207,7 +204,6 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -222,7 +218,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
             error = self._deserialize.failsafe_deserialize(_models.CloudErrorAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileServiceItems", pipeline_response)
+        deserialized = self._deserialize("FileServiceItems", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -329,7 +325,7 @@ def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.FileServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -364,7 +360,6 @@ def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -379,7 +374,7 @@ def set_service_properties(
             error = self._deserialize.failsafe_deserialize(_models.CloudErrorAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileServiceProperties", pipeline_response)
+        deserialized = self._deserialize("FileServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -407,7 +402,7 @@ def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.FileServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -430,7 +425,6 @@ def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -445,7 +439,7 @@ def get_service_properties(
             error = self._deserialize.failsafe_deserialize(_models.CloudErrorAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileServiceProperties", pipeline_response)
+        deserialized = self._deserialize("FileServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/operations/_file_shares_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/operations/_file_shares_operations.py
index 99420fb844a4..e2897c378ac5 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/operations/_file_shares_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/operations/_file_shares_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,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 (
@@ -21,20 +21,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -401,7 +399,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-04-01"))
         cls: ClsType[_models.FileShareItems] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -423,7 +421,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -439,7 +436,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -587,7 +583,7 @@ def create(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.FileShare
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -623,7 +619,6 @@ def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -638,11 +633,7 @@ def create(
             error = self._deserialize.failsafe_deserialize(_models.CloudErrorAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("FileShare", pipeline_response)
-
-        if response.status_code == 201:
-            deserialized = self._deserialize("FileShare", pipeline_response)
+        deserialized = self._deserialize("FileShare", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -752,7 +743,7 @@ def update(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.FileShare
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -787,7 +778,6 @@ def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -802,7 +792,7 @@ def update(
             error = self._deserialize.failsafe_deserialize(_models.CloudErrorAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileShare", pipeline_response)
+        deserialized = self._deserialize("FileShare", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -843,7 +833,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.FileShare
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -868,7 +858,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -883,7 +872,7 @@ def get(
             error = self._deserialize.failsafe_deserialize(_models.CloudErrorAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileShare", pipeline_response)
+        deserialized = self._deserialize("FileShare", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -928,7 +917,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,
@@ -953,7 +942,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -972,7 +960,7 @@ def delete(  # pylint: disable=inconsistent-return-statements
             return cls(pipeline_response, None, {})  # type: ignore
 
     @overload
-    def restore(  # pylint: disable=inconsistent-return-statements
+    def restore(
         self,
         resource_group_name: str,
         account_name: str,
@@ -1007,7 +995,7 @@ def restore(  # pylint: disable=inconsistent-return-statements
         """
 
     @overload
-    def restore(  # pylint: disable=inconsistent-return-statements
+    def restore(
         self,
         resource_group_name: str,
         account_name: str,
@@ -1070,7 +1058,7 @@ def restore(  # 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,
@@ -1105,7 +1093,6 @@ def restore(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1238,7 +1225,7 @@ def lease(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.LeaseShareResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1277,7 +1264,6 @@ def lease(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1295,7 +1281,7 @@ def lease(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("LeaseShareResponse", pipeline_response)
+        deserialized = self._deserialize("LeaseShareResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/operations/_management_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/operations/_management_policies_operations.py
index df046ede1190..dd0dedd7ec84 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/operations/_management_policies_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/operations/_management_policies_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,
@@ -19,20 +18,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -196,7 +193,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.ManagementPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -219,7 +216,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -233,7 +229,7 @@ def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ManagementPolicy", pipeline_response)
+        deserialized = self._deserialize("ManagementPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -337,7 +333,7 @@ def create_or_update(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.ManagementPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -372,7 +368,6 @@ def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -386,7 +381,7 @@ def create_or_update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ManagementPolicy", pipeline_response)
+        deserialized = self._deserialize("ManagementPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -418,7 +413,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,
@@ -441,7 +436,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/operations/_object_replication_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/operations/_object_replication_policies_operations.py
index 311327d9fd46..7b72a487ef2a 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/operations/_object_replication_policies_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/operations/_object_replication_policies_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 (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -229,7 +226,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-04-01"))
         cls: ClsType[_models.ObjectReplicationPolicies] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -248,7 +245,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -264,7 +260,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -316,7 +311,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.ObjectReplicationPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -339,7 +334,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -354,7 +348,7 @@ def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response)
+        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -464,7 +458,7 @@ def create_or_update(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.ObjectReplicationPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -499,7 +493,6 @@ def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -514,7 +507,7 @@ def create_or_update(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response)
+        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -543,7 +536,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,
@@ -566,7 +559,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/operations/_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/operations/_operations.py
index 38500019f335..638a1e27c50e 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/operations/_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/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 (
@@ -20,20 +19,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -94,7 +91,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.Operation"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-04-01"))
         cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -110,7 +107,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -126,7 +122,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/operations/_private_endpoint_connections_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/operations/_private_endpoint_connections_operations.py
index 81eac8d8e1d8..cae0cc802ef5 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/operations/_private_endpoint_connections_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/operations/_private_endpoint_connections_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 (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -241,7 +238,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-04-01"))
         cls: ClsType[_models.PrivateEndpointConnectionListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -260,7 +257,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -276,7 +272,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -325,7 +320,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.PrivateEndpointConnection
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -348,7 +343,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -363,7 +357,7 @@ def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response)
+        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -464,7 +458,7 @@ def put(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.PrivateEndpointConnection
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -499,7 +493,6 @@ def put(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -514,7 +507,7 @@ def put(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response)
+        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -541,7 +534,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,
@@ -564,7 +557,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/operations/_private_link_resources_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/operations/_private_link_resources_operations.py
index 7d0ba74d13ea..e60bf19e5cc1 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/operations/_private_link_resources_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/operations/_private_link_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, Optional, Type, TypeVar
+from typing import Any, Callable, Dict, Optional, TypeVar
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -18,20 +17,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -109,7 +106,7 @@ def list_by_storage_account(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.PrivateLinkResourceListResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -131,7 +128,6 @@ def list_by_storage_account(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -145,7 +141,7 @@ def list_by_storage_account(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("PrivateLinkResourceListResult", pipeline_response)
+        deserialized = self._deserialize("PrivateLinkResourceListResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/operations/_queue_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/operations/_queue_operations.py
index d0329c469f58..53187e18593d 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/operations/_queue_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/operations/_queue_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 (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -375,7 +372,7 @@ def create(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.StorageQueue
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -410,7 +407,6 @@ def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -425,7 +421,7 @@ def create(
             error = self._deserialize.failsafe_deserialize(_models.CloudErrorAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageQueue", pipeline_response)
+        deserialized = self._deserialize("StorageQueue", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -532,7 +528,7 @@ def update(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.StorageQueue
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -567,7 +563,6 @@ def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -582,7 +577,7 @@ def update(
             error = self._deserialize.failsafe_deserialize(_models.CloudErrorAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageQueue", pipeline_response)
+        deserialized = self._deserialize("StorageQueue", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -609,7 +604,7 @@ def get(self, resource_group_name: str, account_name: str, queue_name: str, **kw
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.StorageQueue
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -632,7 +627,6 @@ def get(self, resource_group_name: str, account_name: str, queue_name: str, **kw
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -647,7 +641,7 @@ def get(self, resource_group_name: str, account_name: str, queue_name: str, **kw
             error = self._deserialize.failsafe_deserialize(_models.CloudErrorAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageQueue", pipeline_response)
+        deserialized = self._deserialize("StorageQueue", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -676,7 +670,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,
@@ -699,7 +693,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -751,7 +744,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-04-01"))
         cls: ClsType[_models.ListQueueResource] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -772,7 +765,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -788,7 +780,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/operations/_queue_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/operations/_queue_services_operations.py
index 40e2d5165bc1..2a6e9345608a 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/operations/_queue_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/operations/_queue_services_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,
@@ -19,20 +18,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -185,7 +182,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.ListQueueServices
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -207,7 +204,6 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -222,7 +218,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
             error = self._deserialize.failsafe_deserialize(_models.CloudErrorAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListQueueServices", pipeline_response)
+        deserialized = self._deserialize("ListQueueServices", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -329,7 +325,7 @@ def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.QueueServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -364,7 +360,6 @@ def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -379,7 +374,7 @@ def set_service_properties(
             error = self._deserialize.failsafe_deserialize(_models.CloudErrorAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("QueueServiceProperties", pipeline_response)
+        deserialized = self._deserialize("QueueServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -407,7 +402,7 @@ def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.QueueServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -430,7 +425,6 @@ def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -445,7 +439,7 @@ def get_service_properties(
             error = self._deserialize.failsafe_deserialize(_models.CloudErrorAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("QueueServiceProperties", pipeline_response)
+        deserialized = self._deserialize("QueueServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/operations/_skus_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/operations/_skus_operations.py
index d1a8e845a31a..aa3cd129cd5c 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/operations/_skus_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/operations/_skus_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 (
@@ -20,20 +19,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -99,7 +96,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.SkuInformation"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-04-01"))
         cls: ClsType[_models.StorageSkuListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -116,7 +113,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -132,7 +128,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/operations/_storage_accounts_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/operations/_storage_accounts_operations.py
index 8e61009e7a15..adbcaf0bbf58 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/operations/_storage_accounts_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/operations/_storage_accounts_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,7 @@
 # --------------------------------------------------------------------------
 from io import IOBase
 import sys
-from typing import Any, Callable, Dict, IO, Iterable, Literal, Optional, Type, TypeVar, Union, cast, overload
+from typing import Any, Callable, Dict, IO, Iterable, Iterator, Literal, Optional, TypeVar, Union, cast, overload
 import urllib.parse
 
 from azure.core.exceptions import (
@@ -17,13 +17,14 @@
     ResourceExistsError,
     ResourceNotFoundError,
     ResourceNotModifiedError,
+    StreamClosedError,
+    StreamConsumedError,
     map_error,
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
 from azure.core.polling import LROPoller, NoPolling, PollingMethod
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
@@ -31,12 +32,11 @@
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -582,7 +582,7 @@ def check_name_availability(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.CheckNameAvailabilityResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -614,7 +614,6 @@ def check_name_availability(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -628,7 +627,7 @@ def check_name_availability(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response)
+        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -641,8 +640,8 @@ def _create_initial(
         account_name: str,
         parameters: Union[_models.StorageAccountCreateParameters, IO[bytes]],
         **kwargs: Any
-    ) -> Optional[_models.StorageAccount]:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> Iterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -655,7 +654,7 @@ def _create_initial(
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-04-01"))
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
-        cls: ClsType[Optional[_models.StorageAccount]] = kwargs.pop("cls", None)
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
         _json = None
@@ -676,10 +675,10 @@ def _create_initial(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -687,12 +686,14 @@ def _create_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = None
-        if response.status_code == 200:
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -815,10 +816,11 @@ def begin_create(
                 params=_params,
                 **kwargs
             )
+            raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+            deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
             if cls:
                 return cls(pipeline_response, deserialized, {})  # type: ignore
             return deserialized
@@ -857,7 +859,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,
@@ -879,7 +881,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -924,7 +925,7 @@ def get_properties(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -947,7 +948,6 @@ def get_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -961,7 +961,7 @@ def get_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1072,7 +1072,7 @@ def update(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1106,7 +1106,6 @@ def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1120,7 +1119,7 @@ def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1142,7 +1141,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.StorageAccount"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-04-01"))
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1159,7 +1158,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -1175,7 +1173,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -1222,7 +1219,7 @@ def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> Ite
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-04-01"))
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1240,7 +1237,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -1256,7 +1252,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -1306,7 +1301,7 @@ def list_keys(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.StorageAccountListKeysResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1329,7 +1324,6 @@ def list_keys(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1343,7 +1337,7 @@ def list_keys(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response)
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1437,7 +1431,7 @@ def regenerate_key(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.StorageAccountListKeysResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1471,7 +1465,6 @@ def regenerate_key(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1485,7 +1478,7 @@ def regenerate_key(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response)
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1576,7 +1569,7 @@ def list_account_sas(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.ListAccountSasResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1610,7 +1603,6 @@ def list_account_sas(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1624,7 +1616,7 @@ def list_account_sas(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListAccountSasResponse", pipeline_response)
+        deserialized = self._deserialize("ListAccountSasResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1713,7 +1705,7 @@ def list_service_sas(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.ListServiceSasResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1747,7 +1739,6 @@ def list_service_sas(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1761,17 +1752,15 @@ def list_service_sas(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListServiceSasResponse", pipeline_response)
+        deserialized = self._deserialize("ListServiceSasResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
 
         return deserialized  # type: ignore
 
-    def _failover_initial(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, **kwargs: Any
-    ) -> None:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    def _failover_initial(self, resource_group_name: str, account_name: str, **kwargs: Any) -> Iterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1783,7 +1772,7 @@ def _failover_initial(  # pylint: disable=inconsistent-return-statements
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-04-01"))
-        cls: ClsType[None] = kwargs.pop("cls", None)
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
 
         _request = build_failover_request(
             resource_group_name=resource_group_name,
@@ -1793,10 +1782,10 @@ def _failover_initial(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -1804,11 +1793,19 @@ def _failover_initial(  # pylint: disable=inconsistent-return-statements
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
-            return cls(pipeline_response, None, {})  # type: ignore
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
 
     @distributed_trace
     def begin_failover(self, resource_group_name: str, account_name: str, **kwargs: Any) -> LROPoller[None]:
@@ -1836,7 +1833,7 @@ def begin_failover(self, resource_group_name: str, account_name: str, **kwargs:
         lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
         cont_token: Optional[str] = kwargs.pop("continuation_token", None)
         if cont_token is None:
-            raw_result = self._failover_initial(  # type: ignore
+            raw_result = self._failover_initial(
                 resource_group_name=resource_group_name,
                 account_name=account_name,
                 api_version=api_version,
@@ -1845,6 +1842,7 @@ def begin_failover(self, resource_group_name: str, account_name: str, **kwargs:
                 params=_params,
                 **kwargs
             )
+            raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
@@ -1874,8 +1872,8 @@ def _restore_blob_ranges_initial(
         account_name: str,
         parameters: Union[_models.BlobRestoreParameters, IO[bytes]],
         **kwargs: Any
-    ) -> _models.BlobRestoreStatus:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> Iterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1888,7 +1886,7 @@ def _restore_blob_ranges_initial(
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-04-01"))
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
-        cls: ClsType[_models.BlobRestoreStatus] = kwargs.pop("cls", None)
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
         _json = None
@@ -1909,10 +1907,10 @@ def _restore_blob_ranges_initial(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -1920,14 +1918,14 @@ def _restore_blob_ranges_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response)
-
-        if response.status_code == 202:
-            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response)
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -2040,10 +2038,11 @@ def begin_restore_blob_ranges(
                 params=_params,
                 **kwargs
             )
+            raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):
-            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response)
+            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response.http_response)
             if cls:
                 return cls(pipeline_response, deserialized, {})  # type: ignore
             return deserialized
@@ -2084,7 +2083,7 @@ def revoke_user_delegation_keys(  # pylint: disable=inconsistent-return-statemen
         :rtype: None
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -2106,7 +2105,6 @@ def revoke_user_delegation_keys(  # pylint: disable=inconsistent-return-statemen
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/operations/_table_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/operations/_table_operations.py
index fe340b19e6eb..e8908a16393a 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/operations/_table_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/operations/_table_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 (
@@ -20,20 +19,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -255,7 +252,7 @@ def create(self, resource_group_name: str, account_name: str, table_name: str, *
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.Table
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -278,7 +275,6 @@ def create(self, resource_group_name: str, account_name: str, table_name: str, *
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -293,7 +289,7 @@ def create(self, resource_group_name: str, account_name: str, table_name: str, *
             error = self._deserialize.failsafe_deserialize(_models.CloudErrorAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("Table", pipeline_response)
+        deserialized = self._deserialize("Table", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -319,7 +315,7 @@ def update(self, resource_group_name: str, account_name: str, table_name: str, *
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.Table
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -342,7 +338,6 @@ def update(self, resource_group_name: str, account_name: str, table_name: str, *
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -357,7 +352,7 @@ def update(self, resource_group_name: str, account_name: str, table_name: str, *
             error = self._deserialize.failsafe_deserialize(_models.CloudErrorAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("Table", pipeline_response)
+        deserialized = self._deserialize("Table", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -383,7 +378,7 @@ def get(self, resource_group_name: str, account_name: str, table_name: str, **kw
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.Table
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -406,7 +401,6 @@ def get(self, resource_group_name: str, account_name: str, table_name: str, **kw
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -421,7 +415,7 @@ def get(self, resource_group_name: str, account_name: str, table_name: str, **kw
             error = self._deserialize.failsafe_deserialize(_models.CloudErrorAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("Table", pipeline_response)
+        deserialized = self._deserialize("Table", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -449,7 +443,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,
@@ -472,7 +466,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -511,7 +504,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> It
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-04-01"))
         cls: ClsType[_models.ListTableResource] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -530,7 +523,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -546,7 +538,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/operations/_table_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/operations/_table_services_operations.py
index b94df1db7d41..ba59f3b9e9db 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/operations/_table_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/operations/_table_services_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,
@@ -19,20 +18,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -185,7 +182,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.ListTableServices
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -207,7 +204,6 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -222,7 +218,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
             error = self._deserialize.failsafe_deserialize(_models.CloudErrorAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListTableServices", pipeline_response)
+        deserialized = self._deserialize("ListTableServices", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -329,7 +325,7 @@ def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.TableServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -364,7 +360,6 @@ def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -379,7 +374,7 @@ def set_service_properties(
             error = self._deserialize.failsafe_deserialize(_models.CloudErrorAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("TableServiceProperties", pipeline_response)
+        deserialized = self._deserialize("TableServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -407,7 +402,7 @@ def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_04_01.models.TableServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -430,7 +425,6 @@ def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -445,7 +439,7 @@ def get_service_properties(
             error = self._deserialize.failsafe_deserialize(_models.CloudErrorAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("TableServiceProperties", pipeline_response)
+        deserialized = self._deserialize("TableServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/operations/_usages_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/operations/_usages_operations.py
index f09a6eef31ea..bff537567688 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/operations/_usages_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_04_01/operations/_usages_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 (
@@ -20,20 +19,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -105,7 +102,7 @@ def list_by_location(self, location: str, **kwargs: Any) -> Iterable["_models.Us
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-04-01"))
         cls: ClsType[_models.UsageListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -123,7 +120,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -139,7 +135,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/__init__.py
index a860a5c185c9..60980065e1ee 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/__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 ._storage_management_client import StorageManagementClient
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._storage_management_client import StorageManagementClient  # 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__ = [
     "StorageManagementClient",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/_configuration.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/_configuration.py
index b6d027dc64f6..5d41dc363963 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/_configuration.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/_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 StorageManagementClientConfiguration:  # pylint: disable=too-many-instance-attributes,name-too-long
+class StorageManagementClientConfiguration:  # pylint: disable=too-many-instance-attributes
     """Configuration for StorageManagementClient.
 
     Note that all parameters used to create this instance are saved as instance
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/_metadata.json b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/_metadata.json
index cdc805df4ea8..28d21a67e9ec 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/_metadata.json
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/_metadata.json
@@ -10,8 +10,8 @@
         "azure_arm": true,
         "has_public_lro_operations": true,
         "client_side_validation": false,
-        "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"ARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementClientConfiguration\"], \".._serialization\": [\"Deserializer\", \"Serializer\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}}",
-        "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"AsyncARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"AsyncARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementClientConfiguration\"], \"..._serialization\": [\"Deserializer\", \"Serializer\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"]}}}"
+        "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"ARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementClientConfiguration\"], \".._serialization\": [\"Deserializer\", \"Serializer\"]}, \"stdlib\": {\"typing_extensions\": [\"Self\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}}",
+        "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"AsyncARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"AsyncARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementClientConfiguration\"], \"..._serialization\": [\"Deserializer\", \"Serializer\"]}, \"stdlib\": {\"typing_extensions\": [\"Self\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"]}}}"
     },
     "global_parameters": {
         "sync": {
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/_storage_management_client.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/_storage_management_client.py
index b39d558d3e45..cb68553e33b1 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/_storage_management_client.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/_storage_management_client.py
@@ -8,6 +8,7 @@
 
 from copy import deepcopy
 from typing import Any, TYPE_CHECKING
+from typing_extensions import Self
 
 from azure.core.pipeline import policies
 from azure.core.rest import HttpRequest, HttpResponse
@@ -40,11 +41,10 @@
 )
 
 if TYPE_CHECKING:
-    # pylint: disable=unused-import,ungrouped-imports
     from azure.core.credentials import TokenCredential
 
 
-class StorageManagementClient:  # pylint: disable=client-accepts-api-version-keyword,too-many-instance-attributes
+class StorageManagementClient:  # pylint: disable=too-many-instance-attributes
     """The Azure Storage Management API.
 
     :ivar operations: Operations operations
@@ -211,7 +211,7 @@ def _send_request(self, request: HttpRequest, *, stream: bool = False, **kwargs:
     def close(self) -> None:
         self._client.close()
 
-    def __enter__(self) -> "StorageManagementClient":
+    def __enter__(self) -> Self:
         self._client.__enter__()
         return self
 
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/_vendor.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/_vendor.py
deleted file mode 100644
index 0dafe0e287ff..000000000000
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/_vendor.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# --------------------------------------------------------------------------
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License. See License.txt in the project root for license information.
-# Code generated by Microsoft (R) AutoRest Code Generator.
-# Changes may cause incorrect behavior and will be lost if the code is regenerated.
-# --------------------------------------------------------------------------
-
-from azure.core.pipeline.transport import HttpRequest
-
-
-def _convert_request(request, files=None):
-    data = request.content if not files else None
-    request = HttpRequest(method=request.method, url=request.url, headers=request.headers, data=data)
-    if files:
-        request.set_formdata_body(files)
-    return request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/_version.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/_version.py
index 5a163c0afedc..e5754a47ce68 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/_version.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/_version.py
@@ -6,4 +6,4 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-VERSION = "21.2.1"
\ No newline at end of file
+VERSION = "1.0.0b1"
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/__init__.py
index a5c3d2414cfd..ee2b940bd4fc 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/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 ._storage_management_client import StorageManagementClient
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._storage_management_client import StorageManagementClient  # 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__ = [
     "StorageManagementClient",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/_configuration.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/_configuration.py
index fa741b201cef..5ebc9640b03f 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/_configuration.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/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 StorageManagementClientConfiguration:  # pylint: disable=too-many-instance-attributes,name-too-long
+class StorageManagementClientConfiguration:  # pylint: disable=too-many-instance-attributes
     """Configuration for StorageManagementClient.
 
     Note that all parameters used to create this instance are saved as instance
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/_storage_management_client.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/_storage_management_client.py
index bf308736b008..cdca57775870 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/_storage_management_client.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/_storage_management_client.py
@@ -8,6 +8,7 @@
 
 from copy import deepcopy
 from typing import Any, Awaitable, TYPE_CHECKING
+from typing_extensions import Self
 
 from azure.core.pipeline import policies
 from azure.core.rest import AsyncHttpResponse, HttpRequest
@@ -40,11 +41,10 @@
 )
 
 if TYPE_CHECKING:
-    # pylint: disable=unused-import,ungrouped-imports
     from azure.core.credentials_async import AsyncTokenCredential
 
 
-class StorageManagementClient:  # pylint: disable=client-accepts-api-version-keyword,too-many-instance-attributes
+class StorageManagementClient:  # pylint: disable=too-many-instance-attributes
     """The Azure Storage Management API.
 
     :ivar operations: Operations operations
@@ -216,7 +216,7 @@ def _send_request(
     async def close(self) -> None:
         await self._client.close()
 
-    async def __aenter__(self) -> "StorageManagementClient":
+    async def __aenter__(self) -> Self:
         await self._client.__aenter__()
         return self
 
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/operations/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/operations/__init__.py
index 0f201012e160..d406c5bf4d6b 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/operations/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/operations/__init__.py
@@ -5,29 +5,35 @@
 # 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 ._skus_operations import SkusOperations
-from ._storage_accounts_operations import StorageAccountsOperations
-from ._deleted_accounts_operations import DeletedAccountsOperations
-from ._usages_operations import UsagesOperations
-from ._management_policies_operations import ManagementPoliciesOperations
-from ._blob_inventory_policies_operations import BlobInventoryPoliciesOperations
-from ._private_endpoint_connections_operations import PrivateEndpointConnectionsOperations
-from ._private_link_resources_operations import PrivateLinkResourcesOperations
-from ._object_replication_policies_operations import ObjectReplicationPoliciesOperations
-from ._encryption_scopes_operations import EncryptionScopesOperations
-from ._blob_services_operations import BlobServicesOperations
-from ._blob_containers_operations import BlobContainersOperations
-from ._file_services_operations import FileServicesOperations
-from ._file_shares_operations import FileSharesOperations
-from ._queue_services_operations import QueueServicesOperations
-from ._queue_operations import QueueOperations
-from ._table_services_operations import TableServicesOperations
-from ._table_operations import TableOperations
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._operations import Operations  # type: ignore
+from ._skus_operations import SkusOperations  # type: ignore
+from ._storage_accounts_operations import StorageAccountsOperations  # type: ignore
+from ._deleted_accounts_operations import DeletedAccountsOperations  # type: ignore
+from ._usages_operations import UsagesOperations  # type: ignore
+from ._management_policies_operations import ManagementPoliciesOperations  # type: ignore
+from ._blob_inventory_policies_operations import BlobInventoryPoliciesOperations  # type: ignore
+from ._private_endpoint_connections_operations import PrivateEndpointConnectionsOperations  # type: ignore
+from ._private_link_resources_operations import PrivateLinkResourcesOperations  # type: ignore
+from ._object_replication_policies_operations import ObjectReplicationPoliciesOperations  # type: ignore
+from ._encryption_scopes_operations import EncryptionScopesOperations  # type: ignore
+from ._blob_services_operations import BlobServicesOperations  # type: ignore
+from ._blob_containers_operations import BlobContainersOperations  # type: ignore
+from ._file_services_operations import FileServicesOperations  # type: ignore
+from ._file_shares_operations import FileSharesOperations  # type: ignore
+from ._queue_services_operations import QueueServicesOperations  # type: ignore
+from ._queue_operations import QueueOperations  # type: ignore
+from ._table_services_operations import TableServicesOperations  # type: ignore
+from ._table_operations import TableOperations  # 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__ = [
@@ -51,5 +57,5 @@
     "TableServicesOperations",
     "TableOperations",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/operations/_blob_containers_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/operations/_blob_containers_operations.py
index 7ab4691b7a23..10e84b3c00ca 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/operations/_blob_containers_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/operations/_blob_containers_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,20 @@
 # --------------------------------------------------------------------------
 from io import IOBase
 import sys
-from typing import Any, AsyncIterable, Callable, Dict, IO, Literal, Optional, Type, TypeVar, Union, cast, overload
+from typing import (
+    Any,
+    AsyncIterable,
+    AsyncIterator,
+    Callable,
+    Dict,
+    IO,
+    Literal,
+    Optional,
+    TypeVar,
+    Union,
+    cast,
+    overload,
+)
 import urllib.parse
 
 from azure.core.async_paging import AsyncItemPaged, AsyncList
@@ -18,12 +31,13 @@
     ResourceExistsError,
     ResourceNotFoundError,
     ResourceNotModifiedError,
+    StreamClosedError,
+    StreamConsumedError,
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
 from azure.core.polling import AsyncLROPoller, AsyncNoPolling, AsyncPollingMethod
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
@@ -31,7 +45,6 @@
 from azure.mgmt.core.polling.async_arm_polling import AsyncARMPolling
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._blob_containers_operations import (
     build_clear_legal_hold_request,
     build_create_or_update_immutability_policy_request,
@@ -52,7 +65,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]]
 
@@ -117,7 +130,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-06-01"))
         cls: ClsType[_models.ListContainerItems] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -139,7 +152,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -155,7 +167,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -290,7 +301,7 @@ async def create(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -325,7 +336,6 @@ async def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -339,11 +349,7 @@ async def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("BlobContainer", pipeline_response)
-
-        if response.status_code == 201:
-            deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -453,7 +459,7 @@ async def update(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -488,7 +494,6 @@ async def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -502,7 +507,7 @@ async def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -531,7 +536,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -554,7 +559,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -568,7 +572,7 @@ async def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -576,9 +580,7 @@ async def get(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, container_name: str, **kwargs: Any
-    ) -> None:
+    async def delete(self, resource_group_name: str, account_name: str, container_name: str, **kwargs: Any) -> None:
         """Deletes specified container under its account.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -597,7 +599,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,
@@ -620,7 +622,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -743,7 +744,7 @@ async def set_legal_hold(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.LegalHold
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -778,7 +779,6 @@ async def set_legal_hold(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -792,7 +792,7 @@ async def set_legal_hold(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LegalHold", pipeline_response)
+        deserialized = self._deserialize("LegalHold", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -902,7 +902,7 @@ async def clear_legal_hold(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.LegalHold
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -937,7 +937,6 @@ async def clear_legal_hold(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -951,7 +950,7 @@ async def clear_legal_hold(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LegalHold", pipeline_response)
+        deserialized = self._deserialize("LegalHold", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1078,7 +1077,7 @@ async def create_or_update_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1119,7 +1118,6 @@ async def create_or_update_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1136,7 +1134,7 @@ async def create_or_update_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1175,7 +1173,7 @@ async def get_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1201,7 +1199,6 @@ async def get_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1218,7 +1215,7 @@ async def get_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1254,7 +1251,7 @@ async def delete_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1280,7 +1277,6 @@ async def delete_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1297,7 +1293,7 @@ async def delete_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1331,7 +1327,7 @@ async def lock_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1355,7 +1351,6 @@ async def lock_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1372,7 +1367,7 @@ async def lock_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1502,7 +1497,7 @@ async def extend_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1541,7 +1536,6 @@ async def extend_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1558,7 +1552,7 @@ async def extend_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1668,7 +1662,7 @@ async def lease(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.LeaseContainerResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1706,7 +1700,6 @@ async def lease(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1720,17 +1713,17 @@ async def lease(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LeaseContainerResponse", pipeline_response)
+        deserialized = self._deserialize("LeaseContainerResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
 
         return deserialized  # type: ignore
 
-    async def _object_level_worm_initial(  # pylint: disable=inconsistent-return-statements
+    async def _object_level_worm_initial(
         self, resource_group_name: str, account_name: str, container_name: str, **kwargs: Any
-    ) -> None:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1742,7 +1735,7 @@ async def _object_level_worm_initial(  # pylint: disable=inconsistent-return-sta
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-06-01"))
-        cls: ClsType[None] = kwargs.pop("cls", None)
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
 
         _request = build_object_level_worm_request(
             resource_group_name=resource_group_name,
@@ -1753,10 +1746,10 @@ async def _object_level_worm_initial(  # pylint: disable=inconsistent-return-sta
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -1764,11 +1757,19 @@ async def _object_level_worm_initial(  # pylint: disable=inconsistent-return-sta
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
-            return cls(pipeline_response, None, {})  # type: ignore
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
 
     @distributed_trace_async
     async def begin_object_level_worm(
@@ -1804,7 +1805,7 @@ async def begin_object_level_worm(
         lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
         cont_token: Optional[str] = kwargs.pop("continuation_token", None)
         if cont_token is None:
-            raw_result = await self._object_level_worm_initial(  # type: ignore
+            raw_result = await self._object_level_worm_initial(
                 resource_group_name=resource_group_name,
                 account_name=account_name,
                 container_name=container_name,
@@ -1814,6 +1815,7 @@ async def begin_object_level_worm(
                 params=_params,
                 **kwargs
             )
+            await raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/operations/_blob_inventory_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/operations/_blob_inventory_policies_operations.py
index 643de8223d56..45cfaea3a5ae 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/operations/_blob_inventory_policies_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/operations/_blob_inventory_policies_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._blob_inventory_policies_operations import (
     build_create_or_update_request,
     build_delete_request,
@@ -40,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]]
 
@@ -90,7 +87,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.BlobInventoryPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -113,7 +110,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -128,7 +124,7 @@ async def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response)
+        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -232,7 +228,7 @@ async def create_or_update(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.BlobInventoryPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -267,7 +263,6 @@ async def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -282,7 +277,7 @@ async def create_or_update(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response)
+        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -290,7 +285,7 @@ async def create_or_update(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
+    async def delete(
         self,
         resource_group_name: str,
         account_name: str,
@@ -314,7 +309,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,
@@ -337,7 +332,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -379,7 +373,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-06-01"))
         cls: ClsType[_models.ListBlobInventoryPolicy] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -398,7 +392,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -414,7 +407,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/operations/_blob_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/operations/_blob_services_operations.py
index fb23043de6e1..d41048a1ae89 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/operations/_blob_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/operations/_blob_services_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, Literal, Optional, Type, TypeVar, Union, overload
+from typing import Any, AsyncIterable, Callable, Dict, IO, Literal, Optional, TypeVar, Union, overload
 import urllib.parse
 
 from azure.core.async_paging import AsyncItemPaged, AsyncList
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._blob_services_operations import (
     build_get_service_properties_request,
     build_list_request,
@@ -39,7 +36,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 +86,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-06-01"))
         cls: ClsType[_models.BlobServiceItems] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -108,7 +105,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -124,7 +120,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -241,7 +236,7 @@ async def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.BlobServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -277,7 +272,6 @@ async def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -291,7 +285,7 @@ async def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobServiceProperties", pipeline_response)
+        deserialized = self._deserialize("BlobServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -316,7 +310,7 @@ async def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.BlobServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -340,7 +334,6 @@ async def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -354,7 +347,7 @@ async def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobServiceProperties", pipeline_response)
+        deserialized = self._deserialize("BlobServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/operations/_deleted_accounts_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/operations/_deleted_accounts_operations.py
index 2c1c9c108721..43fce3790b81 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/operations/_deleted_accounts_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/operations/_deleted_accounts_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
@@ -20,21 +19,19 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._deleted_accounts_operations import build_get_request, build_list_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
 
@@ -74,7 +71,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.DeletedAccount"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-06-01"))
         cls: ClsType[_models.DeletedAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -91,7 +88,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -107,7 +103,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -149,7 +144,7 @@ async def get(self, deleted_account_name: str, location: str, **kwargs: Any) ->
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.DeletedAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -171,7 +166,6 @@ async def get(self, deleted_account_name: str, location: str, **kwargs: Any) ->
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -186,7 +180,7 @@ async def get(self, deleted_account_name: str, location: str, **kwargs: Any) ->
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("DeletedAccount", pipeline_response)
+        deserialized = self._deserialize("DeletedAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/operations/_encryption_scopes_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/operations/_encryption_scopes_operations.py
index edca3705f59d..a34d26ea65ec 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/operations/_encryption_scopes_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/operations/_encryption_scopes_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._encryption_scopes_operations import (
     build_get_request,
     build_list_request,
@@ -40,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]]
 
@@ -173,7 +170,7 @@ async def put(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.EncryptionScope
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -208,7 +205,6 @@ async def put(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -223,11 +219,7 @@ async def put(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("EncryptionScope", pipeline_response)
-
-        if response.status_code == 201:
-            deserialized = self._deserialize("EncryptionScope", pipeline_response)
+        deserialized = self._deserialize("EncryptionScope", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -337,7 +329,7 @@ async def patch(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.EncryptionScope
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -372,7 +364,6 @@ async def patch(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -387,7 +378,7 @@ async def patch(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("EncryptionScope", pipeline_response)
+        deserialized = self._deserialize("EncryptionScope", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -416,7 +407,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.EncryptionScope
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -439,7 +430,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -454,7 +444,7 @@ async def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("EncryptionScope", pipeline_response)
+        deserialized = self._deserialize("EncryptionScope", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -485,7 +475,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-06-01"))
         cls: ClsType[_models.EncryptionScopeListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -504,7 +494,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -520,7 +509,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/operations/_file_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/operations/_file_services_operations.py
index 397fa8cbab87..8747d17acf3b 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/operations/_file_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/operations/_file_services_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, Literal, Optional, Type, TypeVar, Union, overload
+from typing import Any, Callable, Dict, IO, Literal, Optional, TypeVar, Union, overload
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -19,14 +18,12 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._file_services_operations import (
     build_get_service_properties_request,
     build_list_request,
@@ -36,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]]
 
@@ -76,7 +73,7 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.FileServiceItems
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -98,7 +95,6 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -113,7 +109,7 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
             error = self._deserialize.failsafe_deserialize(_models.CloudErrorAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileServiceItems", pipeline_response)
+        deserialized = self._deserialize("FileServiceItems", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -208,7 +204,7 @@ async def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.FileServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -244,7 +240,6 @@ async def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -259,7 +254,7 @@ async def set_service_properties(
             error = self._deserialize.failsafe_deserialize(_models.CloudErrorAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileServiceProperties", pipeline_response)
+        deserialized = self._deserialize("FileServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -284,7 +279,7 @@ async def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.FileServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -308,7 +303,6 @@ async def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -323,7 +317,7 @@ async def get_service_properties(
             error = self._deserialize.failsafe_deserialize(_models.CloudErrorAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileServiceProperties", pipeline_response)
+        deserialized = self._deserialize("FileServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/operations/_file_shares_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/operations/_file_shares_operations.py
index ea2d37444316..2a18bd37a56e 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/operations/_file_shares_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/operations/_file_shares_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._file_shares_operations import (
     build_create_request,
     build_delete_request,
@@ -43,7 +40,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]]
 
@@ -108,7 +105,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-06-01"))
         cls: ClsType[_models.FileShareItems] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -130,7 +127,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -146,7 +142,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -294,7 +289,7 @@ async def create(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.FileShare
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -330,7 +325,6 @@ async def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -345,11 +339,7 @@ async def create(
             error = self._deserialize.failsafe_deserialize(_models.CloudErrorAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("FileShare", pipeline_response)
-
-        if response.status_code == 201:
-            deserialized = self._deserialize("FileShare", pipeline_response)
+        deserialized = self._deserialize("FileShare", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -459,7 +449,7 @@ async def update(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.FileShare
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -494,7 +484,6 @@ async def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -509,7 +498,7 @@ async def update(
             error = self._deserialize.failsafe_deserialize(_models.CloudErrorAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileShare", pipeline_response)
+        deserialized = self._deserialize("FileShare", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -550,7 +539,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.FileShare
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -575,7 +564,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -590,7 +578,7 @@ async def get(
             error = self._deserialize.failsafe_deserialize(_models.CloudErrorAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileShare", pipeline_response)
+        deserialized = self._deserialize("FileShare", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -598,7 +586,7 @@ async def get(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
+    async def delete(
         self,
         resource_group_name: str,
         account_name: str,
@@ -635,7 +623,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,
@@ -660,7 +648,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -679,7 +666,7 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             return cls(pipeline_response, None, {})  # type: ignore
 
     @overload
-    async def restore(  # pylint: disable=inconsistent-return-statements
+    async def restore(
         self,
         resource_group_name: str,
         account_name: str,
@@ -714,7 +701,7 @@ async def restore(  # pylint: disable=inconsistent-return-statements
         """
 
     @overload
-    async def restore(  # pylint: disable=inconsistent-return-statements
+    async def restore(
         self,
         resource_group_name: str,
         account_name: str,
@@ -749,7 +736,7 @@ async def restore(  # pylint: disable=inconsistent-return-statements
         """
 
     @distributed_trace_async
-    async def restore(  # pylint: disable=inconsistent-return-statements
+    async def restore(
         self,
         resource_group_name: str,
         account_name: str,
@@ -777,7 +764,7 @@ async def restore(  # 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,
@@ -812,7 +799,6 @@ async def restore(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -945,7 +931,7 @@ async def lease(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.LeaseShareResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -984,7 +970,6 @@ async def lease(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1002,7 +987,7 @@ async def lease(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("LeaseShareResponse", pipeline_response)
+        deserialized = self._deserialize("LeaseShareResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/operations/_management_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/operations/_management_policies_operations.py
index c01f4c29e300..39a114ba1032 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/operations/_management_policies_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/operations/_management_policies_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,
@@ -19,14 +18,12 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._management_policies_operations import (
     build_create_or_update_request,
     build_delete_request,
@@ -36,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]]
 
@@ -86,7 +83,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.ManagementPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -109,7 +106,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -123,7 +119,7 @@ async def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ManagementPolicy", pipeline_response)
+        deserialized = self._deserialize("ManagementPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -227,7 +223,7 @@ async def create_or_update(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.ManagementPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -262,7 +258,6 @@ async def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -276,7 +271,7 @@ async def create_or_update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ManagementPolicy", pipeline_response)
+        deserialized = self._deserialize("ManagementPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -284,7 +279,7 @@ async def create_or_update(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
+    async def delete(
         self,
         resource_group_name: str,
         account_name: str,
@@ -308,7 +303,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,
@@ -331,7 +326,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/operations/_object_replication_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/operations/_object_replication_policies_operations.py
index b9fda209fff7..77840a0d38a8 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/operations/_object_replication_policies_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/operations/_object_replication_policies_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._object_replication_policies_operations import (
     build_create_or_update_request,
     build_delete_request,
@@ -40,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]]
 
@@ -90,7 +87,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-06-01"))
         cls: ClsType[_models.ObjectReplicationPolicies] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -109,7 +106,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -125,7 +121,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -177,7 +172,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.ObjectReplicationPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -200,7 +195,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -215,7 +209,7 @@ async def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response)
+        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -325,7 +319,7 @@ async def create_or_update(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.ObjectReplicationPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -360,7 +354,6 @@ async def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -375,7 +368,7 @@ async def create_or_update(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response)
+        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -383,7 +376,7 @@ async def create_or_update(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
+    async def delete(
         self, resource_group_name: str, account_name: str, object_replication_policy_id: str, **kwargs: Any
     ) -> None:
         """Deletes the object replication policy associated with the specified storage account.
@@ -404,7 +397,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,
@@ -427,7 +420,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/operations/_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/operations/_operations.py
index b4b4862e0094..f40a6d6e2626 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/operations/_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/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
@@ -20,20 +19,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._operations import build_list_request
 
 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]]
 
@@ -73,7 +70,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.Operation"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-06-01"))
         cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -89,7 +86,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -105,7 +101,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/operations/_private_endpoint_connections_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/operations/_private_endpoint_connections_operations.py
index 3cdaa2cbaaf0..f396e5312c78 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/operations/_private_endpoint_connections_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/operations/_private_endpoint_connections_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._private_endpoint_connections_operations import (
     build_delete_request,
     build_get_request,
@@ -40,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]]
 
@@ -90,7 +87,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-06-01"))
         cls: ClsType[_models.PrivateEndpointConnectionListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -109,7 +106,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -125,7 +121,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -174,7 +169,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.PrivateEndpointConnection
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -197,7 +192,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -212,7 +206,7 @@ async def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response)
+        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -313,7 +307,7 @@ async def put(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.PrivateEndpointConnection
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -348,7 +342,6 @@ async def put(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -363,7 +356,7 @@ async def put(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response)
+        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -371,7 +364,7 @@ async def put(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
+    async def delete(
         self, resource_group_name: str, account_name: str, private_endpoint_connection_name: str, **kwargs: Any
     ) -> None:
         """Deletes the specified private endpoint connection associated with the storage account.
@@ -390,7 +383,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,
@@ -413,7 +406,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/operations/_private_link_resources_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/operations/_private_link_resources_operations.py
index bce62b832177..631169b76212 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/operations/_private_link_resources_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/operations/_private_link_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, Optional, Type, TypeVar
+from typing import Any, Callable, Dict, Optional, TypeVar
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -18,20 +17,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._private_link_resources_operations import build_list_by_storage_account_request
 
 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]]
 
@@ -73,7 +70,7 @@ async def list_by_storage_account(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.PrivateLinkResourceListResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -95,7 +92,6 @@ async def list_by_storage_account(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -109,7 +105,7 @@ async def list_by_storage_account(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("PrivateLinkResourceListResult", pipeline_response)
+        deserialized = self._deserialize("PrivateLinkResourceListResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/operations/_queue_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/operations/_queue_operations.py
index 69882ae9043e..ed5d2b24fa4a 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/operations/_queue_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/operations/_queue_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._queue_operations import (
     build_create_request,
     build_delete_request,
@@ -41,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]]
 
@@ -166,7 +163,7 @@ async def create(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.StorageQueue
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -201,7 +198,6 @@ async def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -216,7 +212,7 @@ async def create(
             error = self._deserialize.failsafe_deserialize(_models.CloudErrorAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageQueue", pipeline_response)
+        deserialized = self._deserialize("StorageQueue", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -323,7 +319,7 @@ async def update(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.StorageQueue
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -358,7 +354,6 @@ async def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -373,7 +368,7 @@ async def update(
             error = self._deserialize.failsafe_deserialize(_models.CloudErrorAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageQueue", pipeline_response)
+        deserialized = self._deserialize("StorageQueue", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -402,7 +397,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.StorageQueue
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -425,7 +420,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -440,7 +434,7 @@ async def get(
             error = self._deserialize.failsafe_deserialize(_models.CloudErrorAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageQueue", pipeline_response)
+        deserialized = self._deserialize("StorageQueue", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -448,9 +442,7 @@ async def get(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, queue_name: str, **kwargs: Any
-    ) -> None:
+    async def delete(self, resource_group_name: str, account_name: str, queue_name: str, **kwargs: Any) -> None:
         """Deletes the queue with the specified queue name, under the specified account if it exists.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -469,7 +461,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,
@@ -492,7 +484,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -545,7 +536,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-06-01"))
         cls: ClsType[_models.ListQueueResource] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -566,7 +557,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -582,7 +572,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/operations/_queue_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/operations/_queue_services_operations.py
index 7f8f0b75ee56..223e9242825b 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/operations/_queue_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/operations/_queue_services_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, Literal, Optional, Type, TypeVar, Union, overload
+from typing import Any, Callable, Dict, IO, Literal, Optional, TypeVar, Union, overload
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -19,14 +18,12 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._queue_services_operations import (
     build_get_service_properties_request,
     build_list_request,
@@ -36,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]]
 
@@ -76,7 +73,7 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.ListQueueServices
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -98,7 +95,6 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -113,7 +109,7 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
             error = self._deserialize.failsafe_deserialize(_models.CloudErrorAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListQueueServices", pipeline_response)
+        deserialized = self._deserialize("ListQueueServices", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -208,7 +204,7 @@ async def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.QueueServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -244,7 +240,6 @@ async def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -259,7 +254,7 @@ async def set_service_properties(
             error = self._deserialize.failsafe_deserialize(_models.CloudErrorAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("QueueServiceProperties", pipeline_response)
+        deserialized = self._deserialize("QueueServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -284,7 +279,7 @@ async def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.QueueServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -308,7 +303,6 @@ async def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -323,7 +317,7 @@ async def get_service_properties(
             error = self._deserialize.failsafe_deserialize(_models.CloudErrorAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("QueueServiceProperties", pipeline_response)
+        deserialized = self._deserialize("QueueServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/operations/_skus_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/operations/_skus_operations.py
index 4047090dbedc..d2c92b595d1c 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/operations/_skus_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/operations/_skus_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
@@ -20,20 +19,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._skus_operations import build_list_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
 
@@ -73,7 +70,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.SkuInformation"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-06-01"))
         cls: ClsType[_models.StorageSkuListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -90,7 +87,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -106,7 +102,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/operations/_storage_accounts_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/operations/_storage_accounts_operations.py
index d552d004e509..0b51a3e30dcd 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/operations/_storage_accounts_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/operations/_storage_accounts_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,20 @@
 # --------------------------------------------------------------------------
 from io import IOBase
 import sys
-from typing import Any, AsyncIterable, Callable, Dict, IO, Literal, Optional, Type, TypeVar, Union, cast, overload
+from typing import (
+    Any,
+    AsyncIterable,
+    AsyncIterator,
+    Callable,
+    Dict,
+    IO,
+    Literal,
+    Optional,
+    TypeVar,
+    Union,
+    cast,
+    overload,
+)
 import urllib.parse
 
 from azure.core.async_paging import AsyncItemPaged, AsyncList
@@ -18,12 +31,13 @@
     ResourceExistsError,
     ResourceNotFoundError,
     ResourceNotModifiedError,
+    StreamClosedError,
+    StreamConsumedError,
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
 from azure.core.polling import AsyncLROPoller, AsyncNoPolling, AsyncPollingMethod
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
@@ -31,7 +45,6 @@
 from azure.mgmt.core.polling.async_arm_polling import AsyncARMPolling
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._storage_accounts_operations import (
     build_abort_hierarchical_namespace_migration_request,
     build_check_name_availability_request,
@@ -54,7 +67,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]]
 
@@ -137,7 +150,7 @@ async def check_name_availability(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.CheckNameAvailabilityResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -169,7 +182,6 @@ async def check_name_availability(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -183,7 +195,7 @@ async def check_name_availability(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response)
+        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -196,8 +208,8 @@ async def _create_initial(
         account_name: str,
         parameters: Union[_models.StorageAccountCreateParameters, IO[bytes]],
         **kwargs: Any
-    ) -> Optional[_models.StorageAccount]:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -210,7 +222,7 @@ async def _create_initial(
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-06-01"))
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
-        cls: ClsType[Optional[_models.StorageAccount]] = kwargs.pop("cls", None)
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
         _json = None
@@ -231,10 +243,10 @@ async def _create_initial(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -242,12 +254,14 @@ async def _create_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = None
-        if response.status_code == 200:
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -373,10 +387,11 @@ async def begin_create(
                 params=_params,
                 **kwargs
             )
+            await raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+            deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
             if cls:
                 return cls(pipeline_response, deserialized, {})  # type: ignore
             return deserialized
@@ -399,9 +414,7 @@ def get_long_running_output(pipeline_response):
         )
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, **kwargs: Any
-    ) -> None:
+    async def delete(self, resource_group_name: str, account_name: str, **kwargs: Any) -> None:
         """Deletes a storage account in Microsoft Azure.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -415,7 +428,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,
@@ -437,7 +450,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -482,7 +494,7 @@ async def get_properties(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -505,7 +517,6 @@ async def get_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -519,7 +530,7 @@ async def get_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -630,7 +641,7 @@ async def update(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -664,7 +675,6 @@ async def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -678,7 +688,7 @@ async def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -701,7 +711,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.StorageAccount"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-06-01"))
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -718,7 +728,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -734,7 +743,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -784,7 +792,7 @@ def list_by_resource_group(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-06-01"))
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -802,7 +810,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -818,7 +825,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -868,7 +874,7 @@ async def list_keys(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.StorageAccountListKeysResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -891,7 +897,6 @@ async def list_keys(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -905,7 +910,7 @@ async def list_keys(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response)
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -999,7 +1004,7 @@ async def regenerate_key(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.StorageAccountListKeysResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1033,7 +1038,6 @@ async def regenerate_key(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1047,7 +1051,7 @@ async def regenerate_key(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response)
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1138,7 +1142,7 @@ async def list_account_sas(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.ListAccountSasResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1172,7 +1176,6 @@ async def list_account_sas(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1186,7 +1189,7 @@ async def list_account_sas(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListAccountSasResponse", pipeline_response)
+        deserialized = self._deserialize("ListAccountSasResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1275,7 +1278,7 @@ async def list_service_sas(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.ListServiceSasResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1309,7 +1312,6 @@ async def list_service_sas(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1323,17 +1325,17 @@ async def list_service_sas(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListServiceSasResponse", pipeline_response)
+        deserialized = self._deserialize("ListServiceSasResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
 
         return deserialized  # type: ignore
 
-    async def _failover_initial(  # pylint: disable=inconsistent-return-statements
+    async def _failover_initial(
         self, resource_group_name: str, account_name: str, **kwargs: Any
-    ) -> None:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1345,7 +1347,7 @@ async def _failover_initial(  # pylint: disable=inconsistent-return-statements
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-06-01"))
-        cls: ClsType[None] = kwargs.pop("cls", None)
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
 
         _request = build_failover_request(
             resource_group_name=resource_group_name,
@@ -1355,10 +1357,10 @@ async def _failover_initial(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -1366,11 +1368,19 @@ async def _failover_initial(  # pylint: disable=inconsistent-return-statements
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
-            return cls(pipeline_response, None, {})  # type: ignore
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
 
     @distributed_trace_async
     async def begin_failover(self, resource_group_name: str, account_name: str, **kwargs: Any) -> AsyncLROPoller[None]:
@@ -1398,7 +1408,7 @@ async def begin_failover(self, resource_group_name: str, account_name: str, **kw
         lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
         cont_token: Optional[str] = kwargs.pop("continuation_token", None)
         if cont_token is None:
-            raw_result = await self._failover_initial(  # type: ignore
+            raw_result = await self._failover_initial(
                 resource_group_name=resource_group_name,
                 account_name=account_name,
                 api_version=api_version,
@@ -1407,6 +1417,7 @@ async def begin_failover(self, resource_group_name: str, account_name: str, **kw
                 params=_params,
                 **kwargs
             )
+            await raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
@@ -1430,10 +1441,10 @@ def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-
             )
         return AsyncLROPoller[None](self._client, raw_result, get_long_running_output, polling_method)  # type: ignore
 
-    async def _hierarchical_namespace_migration_initial(  # pylint: disable=inconsistent-return-statements,name-too-long
+    async def _hierarchical_namespace_migration_initial(  # pylint: disable=name-too-long
         self, resource_group_name: str, account_name: str, request_type: str, **kwargs: Any
-    ) -> None:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1445,7 +1456,7 @@ async def _hierarchical_namespace_migration_initial(  # pylint: disable=inconsis
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-06-01"))
-        cls: ClsType[None] = kwargs.pop("cls", None)
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
 
         _request = build_hierarchical_namespace_migration_request(
             resource_group_name=resource_group_name,
@@ -1456,10 +1467,10 @@ async def _hierarchical_namespace_migration_initial(  # pylint: disable=inconsis
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -1467,12 +1478,20 @@ async def _hierarchical_namespace_migration_initial(  # pylint: disable=inconsis
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
-            return cls(pipeline_response, None, {})  # type: ignore
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
 
     @distributed_trace_async
     async def begin_hierarchical_namespace_migration(
@@ -1505,7 +1524,7 @@ async def begin_hierarchical_namespace_migration(
         lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
         cont_token: Optional[str] = kwargs.pop("continuation_token", None)
         if cont_token is None:
-            raw_result = await self._hierarchical_namespace_migration_initial(  # type: ignore
+            raw_result = await self._hierarchical_namespace_migration_initial(
                 resource_group_name=resource_group_name,
                 account_name=account_name,
                 request_type=request_type,
@@ -1515,6 +1534,7 @@ async def begin_hierarchical_namespace_migration(
                 params=_params,
                 **kwargs
             )
+            await raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
@@ -1538,10 +1558,10 @@ def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-
             )
         return AsyncLROPoller[None](self._client, raw_result, get_long_running_output, polling_method)  # type: ignore
 
-    async def _abort_hierarchical_namespace_migration_initial(  # pylint: disable=inconsistent-return-statements,name-too-long
+    async def _abort_hierarchical_namespace_migration_initial(  # pylint: disable=name-too-long
         self, resource_group_name: str, account_name: str, **kwargs: Any
-    ) -> None:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1553,7 +1573,7 @@ async def _abort_hierarchical_namespace_migration_initial(  # pylint: disable=in
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-06-01"))
-        cls: ClsType[None] = kwargs.pop("cls", None)
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
 
         _request = build_abort_hierarchical_namespace_migration_request(
             resource_group_name=resource_group_name,
@@ -1563,10 +1583,10 @@ async def _abort_hierarchical_namespace_migration_initial(  # pylint: disable=in
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -1574,12 +1594,20 @@ async def _abort_hierarchical_namespace_migration_initial(  # pylint: disable=in
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
-            return cls(pipeline_response, None, {})  # type: ignore
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
 
     @distributed_trace_async
     async def begin_abort_hierarchical_namespace_migration(  # pylint: disable=name-too-long
@@ -1607,7 +1635,7 @@ async def begin_abort_hierarchical_namespace_migration(  # pylint: disable=name-
         lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
         cont_token: Optional[str] = kwargs.pop("continuation_token", None)
         if cont_token is None:
-            raw_result = await self._abort_hierarchical_namespace_migration_initial(  # type: ignore
+            raw_result = await self._abort_hierarchical_namespace_migration_initial(
                 resource_group_name=resource_group_name,
                 account_name=account_name,
                 api_version=api_version,
@@ -1616,6 +1644,7 @@ async def begin_abort_hierarchical_namespace_migration(  # pylint: disable=name-
                 params=_params,
                 **kwargs
             )
+            await raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
@@ -1645,8 +1674,8 @@ async def _restore_blob_ranges_initial(
         account_name: str,
         parameters: Union[_models.BlobRestoreParameters, IO[bytes]],
         **kwargs: Any
-    ) -> _models.BlobRestoreStatus:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1659,7 +1688,7 @@ async def _restore_blob_ranges_initial(
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-06-01"))
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
-        cls: ClsType[_models.BlobRestoreStatus] = kwargs.pop("cls", None)
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
         _json = None
@@ -1680,10 +1709,10 @@ async def _restore_blob_ranges_initial(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -1691,14 +1720,14 @@ async def _restore_blob_ranges_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response)
-
-        if response.status_code == 202:
-            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response)
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1814,10 +1843,11 @@ async def begin_restore_blob_ranges(
                 params=_params,
                 **kwargs
             )
+            await raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):
-            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response)
+            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response.http_response)
             if cls:
                 return cls(pipeline_response, deserialized, {})  # type: ignore
             return deserialized
@@ -1842,9 +1872,7 @@ def get_long_running_output(pipeline_response):
         )
 
     @distributed_trace_async
-    async def revoke_user_delegation_keys(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, **kwargs: Any
-    ) -> None:
+    async def revoke_user_delegation_keys(self, resource_group_name: str, account_name: str, **kwargs: Any) -> None:
         """Revoke user delegation keys.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -1858,7 +1886,7 @@ async def revoke_user_delegation_keys(  # pylint: disable=inconsistent-return-st
         :rtype: None
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1880,7 +1908,6 @@ async def revoke_user_delegation_keys(  # pylint: disable=inconsistent-return-st
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/operations/_table_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/operations/_table_operations.py
index 9297575e2060..1f637da5d07f 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/operations/_table_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/operations/_table_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
@@ -20,15 +19,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._table_operations import (
     build_create_request,
     build_delete_request,
@@ -40,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]]
 
@@ -86,7 +83,7 @@ async def create(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.Table
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -109,7 +106,6 @@ async def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -124,7 +120,7 @@ async def create(
             error = self._deserialize.failsafe_deserialize(_models.CloudErrorAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("Table", pipeline_response)
+        deserialized = self._deserialize("Table", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -152,7 +148,7 @@ async def update(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.Table
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -175,7 +171,6 @@ async def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -190,7 +185,7 @@ async def update(
             error = self._deserialize.failsafe_deserialize(_models.CloudErrorAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("Table", pipeline_response)
+        deserialized = self._deserialize("Table", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -216,7 +211,7 @@ async def get(self, resource_group_name: str, account_name: str, table_name: str
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.Table
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -239,7 +234,6 @@ async def get(self, resource_group_name: str, account_name: str, table_name: str
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -254,7 +248,7 @@ async def get(self, resource_group_name: str, account_name: str, table_name: str
             error = self._deserialize.failsafe_deserialize(_models.CloudErrorAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("Table", pipeline_response)
+        deserialized = self._deserialize("Table", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -262,9 +256,7 @@ async def get(self, resource_group_name: str, account_name: str, table_name: str
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, table_name: str, **kwargs: Any
-    ) -> None:
+    async def delete(self, resource_group_name: str, account_name: str, table_name: str, **kwargs: Any) -> None:
         """Deletes the table with the specified table name, under the specified account if it exists.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -282,7 +274,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,
@@ -305,7 +297,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -344,7 +335,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> As
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-06-01"))
         cls: ClsType[_models.ListTableResource] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -363,7 +354,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -379,7 +369,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/operations/_table_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/operations/_table_services_operations.py
index 7c0440eae2ac..aac2bf8c6df1 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/operations/_table_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/operations/_table_services_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, Literal, Optional, Type, TypeVar, Union, overload
+from typing import Any, Callable, Dict, IO, Literal, Optional, TypeVar, Union, overload
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -19,14 +18,12 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._table_services_operations import (
     build_get_service_properties_request,
     build_list_request,
@@ -36,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]]
 
@@ -76,7 +73,7 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.ListTableServices
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -98,7 +95,6 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -113,7 +109,7 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
             error = self._deserialize.failsafe_deserialize(_models.CloudErrorAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListTableServices", pipeline_response)
+        deserialized = self._deserialize("ListTableServices", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -208,7 +204,7 @@ async def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.TableServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -244,7 +240,6 @@ async def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -259,7 +254,7 @@ async def set_service_properties(
             error = self._deserialize.failsafe_deserialize(_models.CloudErrorAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("TableServiceProperties", pipeline_response)
+        deserialized = self._deserialize("TableServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -284,7 +279,7 @@ async def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.TableServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -308,7 +303,6 @@ async def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -323,7 +317,7 @@ async def get_service_properties(
             error = self._deserialize.failsafe_deserialize(_models.CloudErrorAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("TableServiceProperties", pipeline_response)
+        deserialized = self._deserialize("TableServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/operations/_usages_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/operations/_usages_operations.py
index 4cd289671675..148cf246e810 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/operations/_usages_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/aio/operations/_usages_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
@@ -20,20 +19,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._usages_operations import build_list_by_location_request
 
 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 +72,7 @@ def list_by_location(self, location: str, **kwargs: Any) -> AsyncIterable["_mode
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-06-01"))
         cls: ClsType[_models.UsageListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -93,7 +90,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -109,7 +105,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/models/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/models/__init__.py
index 4c3f170090a0..72b49db0a0d0 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/models/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/models/__init__.py
@@ -5,211 +5,222 @@
 # 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 AccessPolicy
-from ._models_py3 import AccountImmutabilityPolicyProperties
-from ._models_py3 import AccountSasParameters
-from ._models_py3 import ActiveDirectoryProperties
-from ._models_py3 import AzureEntityResource
-from ._models_py3 import AzureFilesIdentityBasedAuthentication
-from ._models_py3 import BlobContainer
-from ._models_py3 import BlobInventoryPolicy
-from ._models_py3 import BlobInventoryPolicyDefinition
-from ._models_py3 import BlobInventoryPolicyFilter
-from ._models_py3 import BlobInventoryPolicyRule
-from ._models_py3 import BlobInventoryPolicySchema
-from ._models_py3 import BlobRestoreParameters
-from ._models_py3 import BlobRestoreRange
-from ._models_py3 import BlobRestoreStatus
-from ._models_py3 import BlobServiceItems
-from ._models_py3 import BlobServiceProperties
-from ._models_py3 import ChangeFeed
-from ._models_py3 import CheckNameAvailabilityResult
-from ._models_py3 import CloudErrorAutoGenerated
-from ._models_py3 import CloudErrorBody
-from ._models_py3 import CloudErrorBodyAutoGenerated
-from ._models_py3 import CorsRule
-from ._models_py3 import CorsRules
-from ._models_py3 import CustomDomain
-from ._models_py3 import DateAfterCreation
-from ._models_py3 import DateAfterModification
-from ._models_py3 import DeleteRetentionPolicy
-from ._models_py3 import DeletedAccount
-from ._models_py3 import DeletedAccountListResult
-from ._models_py3 import DeletedShare
-from ._models_py3 import Dimension
-from ._models_py3 import Encryption
-from ._models_py3 import EncryptionIdentity
-from ._models_py3 import EncryptionScope
-from ._models_py3 import EncryptionScopeKeyVaultProperties
-from ._models_py3 import EncryptionScopeListResult
-from ._models_py3 import EncryptionService
-from ._models_py3 import EncryptionServices
-from ._models_py3 import Endpoints
-from ._models_py3 import ErrorResponse
-from ._models_py3 import ErrorResponseBody
-from ._models_py3 import ExtendedLocation
-from ._models_py3 import FileServiceItems
-from ._models_py3 import FileServiceProperties
-from ._models_py3 import FileShare
-from ._models_py3 import FileShareItem
-from ._models_py3 import FileShareItems
-from ._models_py3 import GeoReplicationStats
-from ._models_py3 import IPRule
-from ._models_py3 import Identity
-from ._models_py3 import ImmutabilityPolicy
-from ._models_py3 import ImmutabilityPolicyProperties
-from ._models_py3 import ImmutableStorageAccount
-from ._models_py3 import ImmutableStorageWithVersioning
-from ._models_py3 import KeyCreationTime
-from ._models_py3 import KeyPolicy
-from ._models_py3 import KeyVaultProperties
-from ._models_py3 import LastAccessTimeTrackingPolicy
-from ._models_py3 import LeaseContainerRequest
-from ._models_py3 import LeaseContainerResponse
-from ._models_py3 import LeaseShareRequest
-from ._models_py3 import LeaseShareResponse
-from ._models_py3 import LegalHold
-from ._models_py3 import LegalHoldProperties
-from ._models_py3 import ListAccountSasResponse
-from ._models_py3 import ListBlobInventoryPolicy
-from ._models_py3 import ListContainerItem
-from ._models_py3 import ListContainerItems
-from ._models_py3 import ListQueue
-from ._models_py3 import ListQueueResource
-from ._models_py3 import ListQueueServices
-from ._models_py3 import ListServiceSasResponse
-from ._models_py3 import ListTableResource
-from ._models_py3 import ListTableServices
-from ._models_py3 import ManagementPolicy
-from ._models_py3 import ManagementPolicyAction
-from ._models_py3 import ManagementPolicyBaseBlob
-from ._models_py3 import ManagementPolicyDefinition
-from ._models_py3 import ManagementPolicyFilter
-from ._models_py3 import ManagementPolicyRule
-from ._models_py3 import ManagementPolicySchema
-from ._models_py3 import ManagementPolicySnapShot
-from ._models_py3 import ManagementPolicyVersion
-from ._models_py3 import MetricSpecification
-from ._models_py3 import Multichannel
-from ._models_py3 import NetworkRuleSet
-from ._models_py3 import ObjectReplicationPolicies
-from ._models_py3 import ObjectReplicationPolicy
-from ._models_py3 import ObjectReplicationPolicyFilter
-from ._models_py3 import ObjectReplicationPolicyRule
-from ._models_py3 import Operation
-from ._models_py3 import OperationDisplay
-from ._models_py3 import OperationListResult
-from ._models_py3 import PrivateEndpoint
-from ._models_py3 import PrivateEndpointConnection
-from ._models_py3 import PrivateEndpointConnectionListResult
-from ._models_py3 import PrivateLinkResource
-from ._models_py3 import PrivateLinkResourceListResult
-from ._models_py3 import PrivateLinkServiceConnectionState
-from ._models_py3 import ProtectedAppendWritesHistory
-from ._models_py3 import ProtocolSettings
-from ._models_py3 import ProxyResource
-from ._models_py3 import QueueServiceProperties
-from ._models_py3 import Resource
-from ._models_py3 import ResourceAccessRule
-from ._models_py3 import RestorePolicyProperties
-from ._models_py3 import Restriction
-from ._models_py3 import RoutingPreference
-from ._models_py3 import SKUCapability
-from ._models_py3 import SasPolicy
-from ._models_py3 import ServiceSasParameters
-from ._models_py3 import ServiceSpecification
-from ._models_py3 import SignedIdentifier
-from ._models_py3 import Sku
-from ._models_py3 import SkuInformation
-from ._models_py3 import SmbSetting
-from ._models_py3 import StorageAccount
-from ._models_py3 import StorageAccountCheckNameAvailabilityParameters
-from ._models_py3 import StorageAccountCreateParameters
-from ._models_py3 import StorageAccountInternetEndpoints
-from ._models_py3 import StorageAccountKey
-from ._models_py3 import StorageAccountListKeysResult
-from ._models_py3 import StorageAccountListResult
-from ._models_py3 import StorageAccountMicrosoftEndpoints
-from ._models_py3 import StorageAccountRegenerateKeyParameters
-from ._models_py3 import StorageAccountUpdateParameters
-from ._models_py3 import StorageQueue
-from ._models_py3 import StorageSkuListResult
-from ._models_py3 import SystemData
-from ._models_py3 import Table
-from ._models_py3 import TableServiceProperties
-from ._models_py3 import TagFilter
-from ._models_py3 import TagProperty
-from ._models_py3 import TrackedResource
-from ._models_py3 import UpdateHistoryProperty
-from ._models_py3 import Usage
-from ._models_py3 import UsageListResult
-from ._models_py3 import UsageName
-from ._models_py3 import UserAssignedIdentity
-from ._models_py3 import VirtualNetworkRule
+from typing import TYPE_CHECKING
 
-from ._storage_management_client_enums import AccessTier
-from ._storage_management_client_enums import AccountImmutabilityPolicyState
-from ._storage_management_client_enums import AccountStatus
-from ._storage_management_client_enums import BlobInventoryPolicyName
-from ._storage_management_client_enums import BlobRestoreProgressStatus
-from ._storage_management_client_enums import Bypass
-from ._storage_management_client_enums import CorsRuleAllowedMethodsItem
-from ._storage_management_client_enums import CreatedByType
-from ._storage_management_client_enums import DefaultAction
-from ._storage_management_client_enums import DefaultSharePermission
-from ._storage_management_client_enums import DirectoryServiceOptions
-from ._storage_management_client_enums import EnabledProtocols
-from ._storage_management_client_enums import EncryptionScopeSource
-from ._storage_management_client_enums import EncryptionScopeState
-from ._storage_management_client_enums import ExpirationAction
-from ._storage_management_client_enums import ExtendedLocationTypes
-from ._storage_management_client_enums import Format
-from ._storage_management_client_enums import GeoReplicationStatus
-from ._storage_management_client_enums import HttpProtocol
-from ._storage_management_client_enums import IdentityType
-from ._storage_management_client_enums import ImmutabilityPolicyState
-from ._storage_management_client_enums import ImmutabilityPolicyUpdateType
-from ._storage_management_client_enums import InventoryRuleType
-from ._storage_management_client_enums import KeyPermission
-from ._storage_management_client_enums import KeySource
-from ._storage_management_client_enums import KeyType
-from ._storage_management_client_enums import Kind
-from ._storage_management_client_enums import LargeFileSharesState
-from ._storage_management_client_enums import LeaseContainerRequestAction
-from ._storage_management_client_enums import LeaseDuration
-from ._storage_management_client_enums import LeaseShareAction
-from ._storage_management_client_enums import LeaseState
-from ._storage_management_client_enums import LeaseStatus
-from ._storage_management_client_enums import ListContainersInclude
-from ._storage_management_client_enums import ManagementPolicyName
-from ._storage_management_client_enums import MigrationState
-from ._storage_management_client_enums import MinimumTlsVersion
-from ._storage_management_client_enums import Name
-from ._storage_management_client_enums import ObjectType
-from ._storage_management_client_enums import Permissions
-from ._storage_management_client_enums import PrivateEndpointConnectionProvisioningState
-from ._storage_management_client_enums import PrivateEndpointServiceConnectionStatus
-from ._storage_management_client_enums import ProvisioningState
-from ._storage_management_client_enums import PublicAccess
-from ._storage_management_client_enums import PublicNetworkAccess
-from ._storage_management_client_enums import Reason
-from ._storage_management_client_enums import ReasonCode
-from ._storage_management_client_enums import RootSquashType
-from ._storage_management_client_enums import RoutingChoice
-from ._storage_management_client_enums import RuleType
-from ._storage_management_client_enums import Schedule
-from ._storage_management_client_enums import Services
-from ._storage_management_client_enums import ShareAccessTier
-from ._storage_management_client_enums import SignedResource
-from ._storage_management_client_enums import SignedResourceTypes
-from ._storage_management_client_enums import SkuName
-from ._storage_management_client_enums import SkuTier
-from ._storage_management_client_enums import State
-from ._storage_management_client_enums import StorageAccountExpand
-from ._storage_management_client_enums import UsageUnit
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+
+from ._models_py3 import (  # type: ignore
+    AccessPolicy,
+    AccountImmutabilityPolicyProperties,
+    AccountSasParameters,
+    ActiveDirectoryProperties,
+    AzureEntityResource,
+    AzureFilesIdentityBasedAuthentication,
+    BlobContainer,
+    BlobInventoryPolicy,
+    BlobInventoryPolicyDefinition,
+    BlobInventoryPolicyFilter,
+    BlobInventoryPolicyRule,
+    BlobInventoryPolicySchema,
+    BlobRestoreParameters,
+    BlobRestoreRange,
+    BlobRestoreStatus,
+    BlobServiceItems,
+    BlobServiceProperties,
+    ChangeFeed,
+    CheckNameAvailabilityResult,
+    CloudErrorAutoGenerated,
+    CloudErrorBody,
+    CloudErrorBodyAutoGenerated,
+    CorsRule,
+    CorsRules,
+    CustomDomain,
+    DateAfterCreation,
+    DateAfterModification,
+    DeleteRetentionPolicy,
+    DeletedAccount,
+    DeletedAccountListResult,
+    DeletedShare,
+    Dimension,
+    Encryption,
+    EncryptionIdentity,
+    EncryptionScope,
+    EncryptionScopeKeyVaultProperties,
+    EncryptionScopeListResult,
+    EncryptionService,
+    EncryptionServices,
+    Endpoints,
+    ErrorResponse,
+    ErrorResponseBody,
+    ExtendedLocation,
+    FileServiceItems,
+    FileServiceProperties,
+    FileShare,
+    FileShareItem,
+    FileShareItems,
+    GeoReplicationStats,
+    IPRule,
+    Identity,
+    ImmutabilityPolicy,
+    ImmutabilityPolicyProperties,
+    ImmutableStorageAccount,
+    ImmutableStorageWithVersioning,
+    KeyCreationTime,
+    KeyPolicy,
+    KeyVaultProperties,
+    LastAccessTimeTrackingPolicy,
+    LeaseContainerRequest,
+    LeaseContainerResponse,
+    LeaseShareRequest,
+    LeaseShareResponse,
+    LegalHold,
+    LegalHoldProperties,
+    ListAccountSasResponse,
+    ListBlobInventoryPolicy,
+    ListContainerItem,
+    ListContainerItems,
+    ListQueue,
+    ListQueueResource,
+    ListQueueServices,
+    ListServiceSasResponse,
+    ListTableResource,
+    ListTableServices,
+    ManagementPolicy,
+    ManagementPolicyAction,
+    ManagementPolicyBaseBlob,
+    ManagementPolicyDefinition,
+    ManagementPolicyFilter,
+    ManagementPolicyRule,
+    ManagementPolicySchema,
+    ManagementPolicySnapShot,
+    ManagementPolicyVersion,
+    MetricSpecification,
+    Multichannel,
+    NetworkRuleSet,
+    ObjectReplicationPolicies,
+    ObjectReplicationPolicy,
+    ObjectReplicationPolicyFilter,
+    ObjectReplicationPolicyRule,
+    Operation,
+    OperationDisplay,
+    OperationListResult,
+    PrivateEndpoint,
+    PrivateEndpointConnection,
+    PrivateEndpointConnectionListResult,
+    PrivateLinkResource,
+    PrivateLinkResourceListResult,
+    PrivateLinkServiceConnectionState,
+    ProtectedAppendWritesHistory,
+    ProtocolSettings,
+    ProxyResource,
+    QueueServiceProperties,
+    Resource,
+    ResourceAccessRule,
+    RestorePolicyProperties,
+    Restriction,
+    RoutingPreference,
+    SKUCapability,
+    SasPolicy,
+    ServiceSasParameters,
+    ServiceSpecification,
+    SignedIdentifier,
+    Sku,
+    SkuInformation,
+    SmbSetting,
+    StorageAccount,
+    StorageAccountCheckNameAvailabilityParameters,
+    StorageAccountCreateParameters,
+    StorageAccountInternetEndpoints,
+    StorageAccountKey,
+    StorageAccountListKeysResult,
+    StorageAccountListResult,
+    StorageAccountMicrosoftEndpoints,
+    StorageAccountRegenerateKeyParameters,
+    StorageAccountUpdateParameters,
+    StorageQueue,
+    StorageSkuListResult,
+    SystemData,
+    Table,
+    TableServiceProperties,
+    TagFilter,
+    TagProperty,
+    TrackedResource,
+    UpdateHistoryProperty,
+    Usage,
+    UsageListResult,
+    UsageName,
+    UserAssignedIdentity,
+    VirtualNetworkRule,
+)
+
+from ._storage_management_client_enums import (  # type: ignore
+    AccessTier,
+    AccountImmutabilityPolicyState,
+    AccountStatus,
+    BlobInventoryPolicyName,
+    BlobRestoreProgressStatus,
+    Bypass,
+    CorsRuleAllowedMethodsItem,
+    CreatedByType,
+    DefaultAction,
+    DefaultSharePermission,
+    DirectoryServiceOptions,
+    EnabledProtocols,
+    EncryptionScopeSource,
+    EncryptionScopeState,
+    ExpirationAction,
+    ExtendedLocationTypes,
+    Format,
+    GeoReplicationStatus,
+    HttpProtocol,
+    IdentityType,
+    ImmutabilityPolicyState,
+    ImmutabilityPolicyUpdateType,
+    InventoryRuleType,
+    KeyPermission,
+    KeySource,
+    KeyType,
+    Kind,
+    LargeFileSharesState,
+    LeaseContainerRequestAction,
+    LeaseDuration,
+    LeaseShareAction,
+    LeaseState,
+    LeaseStatus,
+    ListContainersInclude,
+    ManagementPolicyName,
+    MigrationState,
+    MinimumTlsVersion,
+    Name,
+    ObjectType,
+    Permissions,
+    PrivateEndpointConnectionProvisioningState,
+    PrivateEndpointServiceConnectionStatus,
+    ProvisioningState,
+    PublicAccess,
+    PublicNetworkAccess,
+    Reason,
+    ReasonCode,
+    RootSquashType,
+    RoutingChoice,
+    RuleType,
+    Schedule,
+    Services,
+    ShareAccessTier,
+    SignedResource,
+    SignedResourceTypes,
+    SkuName,
+    SkuTier,
+    State,
+    StorageAccountExpand,
+    UsageUnit,
+)
 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__ = [
@@ -415,5 +426,5 @@
     "StorageAccountExpand",
     "UsageUnit",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/models/_models_py3.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/models/_models_py3.py
index 7e7427261fbb..bf58fb75a0fc 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/models/_models_py3.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/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
 
 
@@ -426,7 +425,7 @@ def __init__(
         self.default_share_permission = default_share_permission
 
 
-class BlobContainer(AzureEntityResource):  # pylint: disable=too-many-instance-attributes
+class BlobContainer(AzureEntityResource):
     """Properties of the blob container, including Id, resource name, resource type, Etag.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -1039,7 +1038,7 @@ def __init__(self, **kwargs: Any) -> None:
         self.value = None
 
 
-class BlobServiceProperties(Resource):  # pylint: disable=too-many-instance-attributes
+class BlobServiceProperties(Resource):
     """The properties of a storage account’s Blob service.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -2355,7 +2354,7 @@ def __init__(
         self.protocol_settings = protocol_settings
 
 
-class FileShare(AzureEntityResource):  # pylint: disable=too-many-instance-attributes
+class FileShare(AzureEntityResource):
     """Properties of the file share, including Id, resource name, resource type, Etag.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -2513,7 +2512,7 @@ def __init__(
         self.snapshot_time = None
 
 
-class FileShareItem(AzureEntityResource):  # pylint: disable=too-many-instance-attributes
+class FileShareItem(AzureEntityResource):
     """The file share properties be listed out.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -3268,7 +3267,7 @@ class LeaseContainerRequest(_serialization.Model):
     All required parameters must be populated in order to send to server.
 
     :ivar action: Specifies the lease action. Can be one of the available actions. Required. Known
-     values are: "Acquire", "Renew", "Change", "Release", and "Break".
+     values are: "Acquire", "Renew", "Change", "Release", "Break", and "Break".
     :vartype action: str or ~azure.mgmt.storage.v2021_06_01.models.LeaseContainerRequestAction
     :ivar lease_id: Identifies the lease. Can be specified in any valid GUID string format.
     :vartype lease_id: str
@@ -3307,7 +3306,7 @@ def __init__(
     ) -> None:
         """
         :keyword action: Specifies the lease action. Can be one of the available actions. Required.
-         Known values are: "Acquire", "Renew", "Change", "Release", and "Break".
+         Known values are: "Acquire", "Renew", "Change", "Release", "Break", and "Break".
         :paramtype action: str or ~azure.mgmt.storage.v2021_06_01.models.LeaseContainerRequestAction
         :keyword lease_id: Identifies the lease. Can be specified in any valid GUID string format.
         :paramtype lease_id: str
@@ -3365,7 +3364,7 @@ class LeaseShareRequest(_serialization.Model):
     All required parameters must be populated in order to send to server.
 
     :ivar action: Specifies the lease action. Can be one of the available actions. Required. Known
-     values are: "Acquire", "Renew", "Change", "Release", and "Break".
+     values are: "Acquire", "Renew", "Change", "Release", "Break", and "Break".
     :vartype action: str or ~azure.mgmt.storage.v2021_06_01.models.LeaseShareAction
     :ivar lease_id: Identifies the lease. Can be specified in any valid GUID string format.
     :vartype lease_id: str
@@ -3404,7 +3403,7 @@ def __init__(
     ) -> None:
         """
         :keyword action: Specifies the lease action. Can be one of the available actions. Required.
-         Known values are: "Acquire", "Renew", "Change", "Release", and "Break".
+         Known values are: "Acquire", "Renew", "Change", "Release", "Break", and "Break".
         :paramtype action: str or ~azure.mgmt.storage.v2021_06_01.models.LeaseShareAction
         :keyword lease_id: Identifies the lease. Can be specified in any valid GUID string format.
         :paramtype lease_id: str
@@ -3602,7 +3601,7 @@ def __init__(self, **kwargs: Any) -> None:
         self.value = None
 
 
-class ListContainerItem(AzureEntityResource):  # pylint: disable=too-many-instance-attributes
+class ListContainerItem(AzureEntityResource):
     """The blob container properties be listed out.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -5355,7 +5354,7 @@ def __init__(
         self.expiration_action = expiration_action
 
 
-class ServiceSasParameters(_serialization.Model):  # pylint: disable=too-many-instance-attributes
+class ServiceSasParameters(_serialization.Model):
     """The parameters to list service SAS credentials of a specific resource.
 
     All required parameters must be populated in order to send to server.
@@ -5833,7 +5832,7 @@ def __init__(self, *, location: str, tags: Optional[Dict[str, str]] = None, **kw
         self.location = location
 
 
-class StorageAccount(TrackedResource):  # pylint: disable=too-many-instance-attributes
+class StorageAccount(TrackedResource):
     """The storage account.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -6201,7 +6200,7 @@ def __init__(self, *, name: str, **kwargs: Any) -> None:
         self.name = name
 
 
-class StorageAccountCreateParameters(_serialization.Model):  # pylint: disable=too-many-instance-attributes
+class StorageAccountCreateParameters(_serialization.Model):
     """The parameters used when creating a storage account.
 
     All required parameters must be populated in order to send to server.
@@ -6682,7 +6681,7 @@ def __init__(self, *, key_name: str, **kwargs: Any) -> None:
         self.key_name = key_name
 
 
-class StorageAccountUpdateParameters(_serialization.Model):  # pylint: disable=too-many-instance-attributes
+class StorageAccountUpdateParameters(_serialization.Model):
     """The parameters that can be provided when updating the storage account properties.
 
     :ivar sku: Gets or sets the SKU name. Note that the SKU name cannot be updated to Standard_ZRS,
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/models/_storage_management_client_enums.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/models/_storage_management_client_enums.py
index 1cffd9d76024..01df710050bf 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/models/_storage_management_client_enums.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/models/_storage_management_client_enums.py
@@ -260,6 +260,7 @@ class LeaseContainerRequestAction(str, Enum, metaclass=CaseInsensitiveEnumMeta):
     RENEW = "Renew"
     CHANGE = "Change"
     RELEASE = "Release"
+    BREAK = "Break"
     BREAK_ENUM = "Break"
 
 
@@ -279,6 +280,7 @@ class LeaseShareAction(str, Enum, metaclass=CaseInsensitiveEnumMeta):
     RENEW = "Renew"
     CHANGE = "Change"
     RELEASE = "Release"
+    BREAK = "Break"
     BREAK_ENUM = "Break"
 
 
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/operations/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/operations/__init__.py
index 0f201012e160..d406c5bf4d6b 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/operations/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/operations/__init__.py
@@ -5,29 +5,35 @@
 # 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 ._skus_operations import SkusOperations
-from ._storage_accounts_operations import StorageAccountsOperations
-from ._deleted_accounts_operations import DeletedAccountsOperations
-from ._usages_operations import UsagesOperations
-from ._management_policies_operations import ManagementPoliciesOperations
-from ._blob_inventory_policies_operations import BlobInventoryPoliciesOperations
-from ._private_endpoint_connections_operations import PrivateEndpointConnectionsOperations
-from ._private_link_resources_operations import PrivateLinkResourcesOperations
-from ._object_replication_policies_operations import ObjectReplicationPoliciesOperations
-from ._encryption_scopes_operations import EncryptionScopesOperations
-from ._blob_services_operations import BlobServicesOperations
-from ._blob_containers_operations import BlobContainersOperations
-from ._file_services_operations import FileServicesOperations
-from ._file_shares_operations import FileSharesOperations
-from ._queue_services_operations import QueueServicesOperations
-from ._queue_operations import QueueOperations
-from ._table_services_operations import TableServicesOperations
-from ._table_operations import TableOperations
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._operations import Operations  # type: ignore
+from ._skus_operations import SkusOperations  # type: ignore
+from ._storage_accounts_operations import StorageAccountsOperations  # type: ignore
+from ._deleted_accounts_operations import DeletedAccountsOperations  # type: ignore
+from ._usages_operations import UsagesOperations  # type: ignore
+from ._management_policies_operations import ManagementPoliciesOperations  # type: ignore
+from ._blob_inventory_policies_operations import BlobInventoryPoliciesOperations  # type: ignore
+from ._private_endpoint_connections_operations import PrivateEndpointConnectionsOperations  # type: ignore
+from ._private_link_resources_operations import PrivateLinkResourcesOperations  # type: ignore
+from ._object_replication_policies_operations import ObjectReplicationPoliciesOperations  # type: ignore
+from ._encryption_scopes_operations import EncryptionScopesOperations  # type: ignore
+from ._blob_services_operations import BlobServicesOperations  # type: ignore
+from ._blob_containers_operations import BlobContainersOperations  # type: ignore
+from ._file_services_operations import FileServicesOperations  # type: ignore
+from ._file_shares_operations import FileSharesOperations  # type: ignore
+from ._queue_services_operations import QueueServicesOperations  # type: ignore
+from ._queue_operations import QueueOperations  # type: ignore
+from ._table_services_operations import TableServicesOperations  # type: ignore
+from ._table_operations import TableOperations  # 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__ = [
@@ -51,5 +57,5 @@
     "TableServicesOperations",
     "TableOperations",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/operations/_blob_containers_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/operations/_blob_containers_operations.py
index fd5e13208ba1..5e22b77bf847 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/operations/_blob_containers_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/operations/_blob_containers_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,7 @@
 # --------------------------------------------------------------------------
 from io import IOBase
 import sys
-from typing import Any, Callable, Dict, IO, Iterable, Literal, Optional, Type, TypeVar, Union, cast, overload
+from typing import Any, Callable, Dict, IO, Iterable, Iterator, Literal, Optional, TypeVar, Union, cast, overload
 import urllib.parse
 
 from azure.core.exceptions import (
@@ -17,13 +17,14 @@
     ResourceExistsError,
     ResourceNotFoundError,
     ResourceNotModifiedError,
+    StreamClosedError,
+    StreamConsumedError,
     map_error,
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
 from azure.core.polling import LROPoller, NoPolling, PollingMethod
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
@@ -31,12 +32,11 @@
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -649,7 +649,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-06-01"))
         cls: ClsType[_models.ListContainerItems] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -671,7 +671,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -687,7 +686,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -822,7 +820,7 @@ def create(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -857,7 +855,6 @@ def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -871,11 +868,7 @@ def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("BlobContainer", pipeline_response)
-
-        if response.status_code == 201:
-            deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -985,7 +978,7 @@ def update(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1020,7 +1013,6 @@ def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1034,7 +1026,7 @@ def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1063,7 +1055,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1086,7 +1078,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1100,7 +1091,7 @@ def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1129,7 +1120,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,
@@ -1152,7 +1143,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1275,7 +1265,7 @@ def set_legal_hold(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.LegalHold
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1310,7 +1300,6 @@ def set_legal_hold(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1324,7 +1313,7 @@ def set_legal_hold(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LegalHold", pipeline_response)
+        deserialized = self._deserialize("LegalHold", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1434,7 +1423,7 @@ def clear_legal_hold(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.LegalHold
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1469,7 +1458,6 @@ def clear_legal_hold(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1483,7 +1471,7 @@ def clear_legal_hold(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LegalHold", pipeline_response)
+        deserialized = self._deserialize("LegalHold", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1610,7 +1598,7 @@ def create_or_update_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1651,7 +1639,6 @@ def create_or_update_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1668,7 +1655,7 @@ def create_or_update_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1707,7 +1694,7 @@ def get_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1733,7 +1720,6 @@ def get_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1750,7 +1736,7 @@ def get_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1786,7 +1772,7 @@ def delete_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1812,7 +1798,6 @@ def delete_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1829,7 +1814,7 @@ def delete_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1863,7 +1848,7 @@ def lock_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1887,7 +1872,6 @@ def lock_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1904,7 +1888,7 @@ def lock_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -2034,7 +2018,7 @@ def extend_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -2073,7 +2057,6 @@ def extend_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -2090,7 +2073,7 @@ def extend_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -2200,7 +2183,7 @@ def lease(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.LeaseContainerResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -2238,7 +2221,6 @@ def lease(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -2252,17 +2234,17 @@ def lease(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LeaseContainerResponse", pipeline_response)
+        deserialized = self._deserialize("LeaseContainerResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
 
         return deserialized  # type: ignore
 
-    def _object_level_worm_initial(  # pylint: disable=inconsistent-return-statements
+    def _object_level_worm_initial(
         self, resource_group_name: str, account_name: str, container_name: str, **kwargs: Any
-    ) -> None:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> Iterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -2274,7 +2256,7 @@ def _object_level_worm_initial(  # pylint: disable=inconsistent-return-statement
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-06-01"))
-        cls: ClsType[None] = kwargs.pop("cls", None)
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
 
         _request = build_object_level_worm_request(
             resource_group_name=resource_group_name,
@@ -2285,10 +2267,10 @@ def _object_level_worm_initial(  # pylint: disable=inconsistent-return-statement
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -2296,11 +2278,19 @@ def _object_level_worm_initial(  # pylint: disable=inconsistent-return-statement
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
-            return cls(pipeline_response, None, {})  # type: ignore
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
 
     @distributed_trace
     def begin_object_level_worm(
@@ -2336,7 +2326,7 @@ def begin_object_level_worm(
         lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
         cont_token: Optional[str] = kwargs.pop("continuation_token", None)
         if cont_token is None:
-            raw_result = self._object_level_worm_initial(  # type: ignore
+            raw_result = self._object_level_worm_initial(
                 resource_group_name=resource_group_name,
                 account_name=account_name,
                 container_name=container_name,
@@ -2346,6 +2336,7 @@ def begin_object_level_worm(
                 params=_params,
                 **kwargs
             )
+            raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/operations/_blob_inventory_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/operations/_blob_inventory_policies_operations.py
index 1e2aa0f7ee66..4a842bda00a1 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/operations/_blob_inventory_policies_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/operations/_blob_inventory_policies_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 (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -235,7 +232,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.BlobInventoryPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -258,7 +255,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -273,7 +269,7 @@ def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response)
+        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -377,7 +373,7 @@ def create_or_update(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.BlobInventoryPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -412,7 +408,6 @@ def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -427,7 +422,7 @@ def create_or_update(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response)
+        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -459,7 +454,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,
@@ -482,7 +477,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -524,7 +518,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-06-01"))
         cls: ClsType[_models.ListBlobInventoryPolicy] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -543,7 +537,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -559,7 +552,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/operations/_blob_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/operations/_blob_services_operations.py
index 09517a76d6e6..f103f0af193d 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/operations/_blob_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/operations/_blob_services_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, Literal, Optional, Type, TypeVar, Union, overload
+from typing import Any, Callable, Dict, IO, Iterable, Literal, Optional, TypeVar, Union, overload
 import urllib.parse
 
 from azure.core.exceptions import (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -191,7 +188,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-06-01"))
         cls: ClsType[_models.BlobServiceItems] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -210,7 +207,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -226,7 +222,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -343,7 +338,7 @@ def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.BlobServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -379,7 +374,6 @@ def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -393,7 +387,7 @@ def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobServiceProperties", pipeline_response)
+        deserialized = self._deserialize("BlobServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -418,7 +412,7 @@ def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.BlobServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -442,7 +436,6 @@ def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -456,7 +449,7 @@ def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobServiceProperties", pipeline_response)
+        deserialized = self._deserialize("BlobServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/operations/_deleted_accounts_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/operations/_deleted_accounts_operations.py
index 6d51302ffe3e..4b7d0b31d62c 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/operations/_deleted_accounts_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/operations/_deleted_accounts_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 (
@@ -20,20 +19,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -130,7 +127,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.DeletedAccount"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-06-01"))
         cls: ClsType[_models.DeletedAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -147,7 +144,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -163,7 +159,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -205,7 +200,7 @@ def get(self, deleted_account_name: str, location: str, **kwargs: Any) -> _model
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.DeletedAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -227,7 +222,6 @@ def get(self, deleted_account_name: str, location: str, **kwargs: Any) -> _model
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -242,7 +236,7 @@ def get(self, deleted_account_name: str, location: str, **kwargs: Any) -> _model
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("DeletedAccount", pipeline_response)
+        deserialized = self._deserialize("DeletedAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/operations/_encryption_scopes_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/operations/_encryption_scopes_operations.py
index 38d1e98e2dd7..c259b96a1045 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/operations/_encryption_scopes_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/operations/_encryption_scopes_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 (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -315,7 +312,7 @@ def put(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.EncryptionScope
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -350,7 +347,6 @@ def put(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -365,11 +361,7 @@ def put(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("EncryptionScope", pipeline_response)
-
-        if response.status_code == 201:
-            deserialized = self._deserialize("EncryptionScope", pipeline_response)
+        deserialized = self._deserialize("EncryptionScope", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -479,7 +471,7 @@ def patch(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.EncryptionScope
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -514,7 +506,6 @@ def patch(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -529,7 +520,7 @@ def patch(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("EncryptionScope", pipeline_response)
+        deserialized = self._deserialize("EncryptionScope", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -558,7 +549,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.EncryptionScope
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -581,7 +572,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -596,7 +586,7 @@ def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("EncryptionScope", pipeline_response)
+        deserialized = self._deserialize("EncryptionScope", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -624,7 +614,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> It
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-06-01"))
         cls: ClsType[_models.EncryptionScopeListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -643,7 +633,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -659,7 +648,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/operations/_file_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/operations/_file_services_operations.py
index 09c0e1f15df9..244b6936e719 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/operations/_file_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/operations/_file_services_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, Literal, Optional, Type, TypeVar, Union, overload
+from typing import Any, Callable, Dict, IO, Literal, Optional, TypeVar, Union, overload
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -19,20 +18,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -179,7 +176,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.FileServiceItems
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -201,7 +198,6 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -216,7 +212,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
             error = self._deserialize.failsafe_deserialize(_models.CloudErrorAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileServiceItems", pipeline_response)
+        deserialized = self._deserialize("FileServiceItems", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -311,7 +307,7 @@ def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.FileServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -347,7 +343,6 @@ def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -362,7 +357,7 @@ def set_service_properties(
             error = self._deserialize.failsafe_deserialize(_models.CloudErrorAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileServiceProperties", pipeline_response)
+        deserialized = self._deserialize("FileServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -387,7 +382,7 @@ def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.FileServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -411,7 +406,6 @@ def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -426,7 +420,7 @@ def get_service_properties(
             error = self._deserialize.failsafe_deserialize(_models.CloudErrorAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileServiceProperties", pipeline_response)
+        deserialized = self._deserialize("FileServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/operations/_file_shares_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/operations/_file_shares_operations.py
index b07322e038ce..0d09adc42583 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/operations/_file_shares_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/operations/_file_shares_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,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 (
@@ -21,20 +21,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -401,7 +399,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-06-01"))
         cls: ClsType[_models.FileShareItems] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -423,7 +421,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -439,7 +436,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -587,7 +583,7 @@ def create(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.FileShare
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -623,7 +619,6 @@ def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -638,11 +633,7 @@ def create(
             error = self._deserialize.failsafe_deserialize(_models.CloudErrorAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("FileShare", pipeline_response)
-
-        if response.status_code == 201:
-            deserialized = self._deserialize("FileShare", pipeline_response)
+        deserialized = self._deserialize("FileShare", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -752,7 +743,7 @@ def update(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.FileShare
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -787,7 +778,6 @@ def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -802,7 +792,7 @@ def update(
             error = self._deserialize.failsafe_deserialize(_models.CloudErrorAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileShare", pipeline_response)
+        deserialized = self._deserialize("FileShare", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -843,7 +833,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.FileShare
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -868,7 +858,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -883,7 +872,7 @@ def get(
             error = self._deserialize.failsafe_deserialize(_models.CloudErrorAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileShare", pipeline_response)
+        deserialized = self._deserialize("FileShare", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -928,7 +917,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,
@@ -953,7 +942,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -972,7 +960,7 @@ def delete(  # pylint: disable=inconsistent-return-statements
             return cls(pipeline_response, None, {})  # type: ignore
 
     @overload
-    def restore(  # pylint: disable=inconsistent-return-statements
+    def restore(
         self,
         resource_group_name: str,
         account_name: str,
@@ -1007,7 +995,7 @@ def restore(  # pylint: disable=inconsistent-return-statements
         """
 
     @overload
-    def restore(  # pylint: disable=inconsistent-return-statements
+    def restore(
         self,
         resource_group_name: str,
         account_name: str,
@@ -1070,7 +1058,7 @@ def restore(  # 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,
@@ -1105,7 +1093,6 @@ def restore(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1238,7 +1225,7 @@ def lease(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.LeaseShareResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1277,7 +1264,6 @@ def lease(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1295,7 +1281,7 @@ def lease(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("LeaseShareResponse", pipeline_response)
+        deserialized = self._deserialize("LeaseShareResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/operations/_management_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/operations/_management_policies_operations.py
index 92c800bb0ad2..9077d8e4f4d8 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/operations/_management_policies_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/operations/_management_policies_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,
@@ -19,20 +18,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -196,7 +193,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.ManagementPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -219,7 +216,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -233,7 +229,7 @@ def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ManagementPolicy", pipeline_response)
+        deserialized = self._deserialize("ManagementPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -337,7 +333,7 @@ def create_or_update(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.ManagementPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -372,7 +368,6 @@ def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -386,7 +381,7 @@ def create_or_update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ManagementPolicy", pipeline_response)
+        deserialized = self._deserialize("ManagementPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -418,7 +413,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,
@@ -441,7 +436,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/operations/_object_replication_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/operations/_object_replication_policies_operations.py
index e2c9f586f3cd..2a7172988972 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/operations/_object_replication_policies_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/operations/_object_replication_policies_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 (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -229,7 +226,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-06-01"))
         cls: ClsType[_models.ObjectReplicationPolicies] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -248,7 +245,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -264,7 +260,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -316,7 +311,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.ObjectReplicationPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -339,7 +334,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -354,7 +348,7 @@ def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response)
+        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -464,7 +458,7 @@ def create_or_update(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.ObjectReplicationPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -499,7 +493,6 @@ def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -514,7 +507,7 @@ def create_or_update(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response)
+        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -543,7 +536,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,
@@ -566,7 +559,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/operations/_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/operations/_operations.py
index e5234b1530f7..fd8660356f87 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/operations/_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/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 (
@@ -20,20 +19,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -94,7 +91,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.Operation"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-06-01"))
         cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -110,7 +107,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -126,7 +122,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/operations/_private_endpoint_connections_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/operations/_private_endpoint_connections_operations.py
index ea3b9f828753..ba7c2d9418b9 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/operations/_private_endpoint_connections_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/operations/_private_endpoint_connections_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 (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -241,7 +238,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-06-01"))
         cls: ClsType[_models.PrivateEndpointConnectionListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -260,7 +257,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -276,7 +272,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -325,7 +320,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.PrivateEndpointConnection
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -348,7 +343,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -363,7 +357,7 @@ def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response)
+        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -464,7 +458,7 @@ def put(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.PrivateEndpointConnection
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -499,7 +493,6 @@ def put(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -514,7 +507,7 @@ def put(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response)
+        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -541,7 +534,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,
@@ -564,7 +557,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/operations/_private_link_resources_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/operations/_private_link_resources_operations.py
index 964448f398ef..4044c864d9b7 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/operations/_private_link_resources_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/operations/_private_link_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, Optional, Type, TypeVar
+from typing import Any, Callable, Dict, Optional, TypeVar
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -18,20 +17,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -109,7 +106,7 @@ def list_by_storage_account(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.PrivateLinkResourceListResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -131,7 +128,6 @@ def list_by_storage_account(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -145,7 +141,7 @@ def list_by_storage_account(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("PrivateLinkResourceListResult", pipeline_response)
+        deserialized = self._deserialize("PrivateLinkResourceListResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/operations/_queue_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/operations/_queue_operations.py
index 7344a3114742..7ff993840b86 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/operations/_queue_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/operations/_queue_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 (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -375,7 +372,7 @@ def create(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.StorageQueue
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -410,7 +407,6 @@ def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -425,7 +421,7 @@ def create(
             error = self._deserialize.failsafe_deserialize(_models.CloudErrorAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageQueue", pipeline_response)
+        deserialized = self._deserialize("StorageQueue", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -532,7 +528,7 @@ def update(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.StorageQueue
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -567,7 +563,6 @@ def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -582,7 +577,7 @@ def update(
             error = self._deserialize.failsafe_deserialize(_models.CloudErrorAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageQueue", pipeline_response)
+        deserialized = self._deserialize("StorageQueue", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -609,7 +604,7 @@ def get(self, resource_group_name: str, account_name: str, queue_name: str, **kw
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.StorageQueue
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -632,7 +627,6 @@ def get(self, resource_group_name: str, account_name: str, queue_name: str, **kw
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -647,7 +641,7 @@ def get(self, resource_group_name: str, account_name: str, queue_name: str, **kw
             error = self._deserialize.failsafe_deserialize(_models.CloudErrorAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageQueue", pipeline_response)
+        deserialized = self._deserialize("StorageQueue", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -676,7 +670,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,
@@ -699,7 +693,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -751,7 +744,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-06-01"))
         cls: ClsType[_models.ListQueueResource] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -772,7 +765,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -788,7 +780,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/operations/_queue_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/operations/_queue_services_operations.py
index 7f24a8cf8d0a..05b7ff03adf5 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/operations/_queue_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/operations/_queue_services_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, Literal, Optional, Type, TypeVar, Union, overload
+from typing import Any, Callable, Dict, IO, Literal, Optional, TypeVar, Union, overload
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -19,20 +18,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -179,7 +176,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.ListQueueServices
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -201,7 +198,6 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -216,7 +212,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
             error = self._deserialize.failsafe_deserialize(_models.CloudErrorAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListQueueServices", pipeline_response)
+        deserialized = self._deserialize("ListQueueServices", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -311,7 +307,7 @@ def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.QueueServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -347,7 +343,6 @@ def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -362,7 +357,7 @@ def set_service_properties(
             error = self._deserialize.failsafe_deserialize(_models.CloudErrorAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("QueueServiceProperties", pipeline_response)
+        deserialized = self._deserialize("QueueServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -387,7 +382,7 @@ def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.QueueServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -411,7 +406,6 @@ def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -426,7 +420,7 @@ def get_service_properties(
             error = self._deserialize.failsafe_deserialize(_models.CloudErrorAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("QueueServiceProperties", pipeline_response)
+        deserialized = self._deserialize("QueueServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/operations/_skus_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/operations/_skus_operations.py
index 87c273564cf4..b86e2ce052ca 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/operations/_skus_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/operations/_skus_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 (
@@ -20,20 +19,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -99,7 +96,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.SkuInformation"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-06-01"))
         cls: ClsType[_models.StorageSkuListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -116,7 +113,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -132,7 +128,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/operations/_storage_accounts_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/operations/_storage_accounts_operations.py
index 1683774b7aad..4f39791c9006 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/operations/_storage_accounts_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/operations/_storage_accounts_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,7 @@
 # --------------------------------------------------------------------------
 from io import IOBase
 import sys
-from typing import Any, Callable, Dict, IO, Iterable, Literal, Optional, Type, TypeVar, Union, cast, overload
+from typing import Any, Callable, Dict, IO, Iterable, Iterator, Literal, Optional, TypeVar, Union, cast, overload
 import urllib.parse
 
 from azure.core.exceptions import (
@@ -17,13 +17,14 @@
     ResourceExistsError,
     ResourceNotFoundError,
     ResourceNotModifiedError,
+    StreamClosedError,
+    StreamConsumedError,
     map_error,
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
 from azure.core.polling import LROPoller, NoPolling, PollingMethod
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
@@ -31,12 +32,11 @@
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -649,7 +649,7 @@ def check_name_availability(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.CheckNameAvailabilityResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -681,7 +681,6 @@ def check_name_availability(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -695,7 +694,7 @@ def check_name_availability(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response)
+        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -708,8 +707,8 @@ def _create_initial(
         account_name: str,
         parameters: Union[_models.StorageAccountCreateParameters, IO[bytes]],
         **kwargs: Any
-    ) -> Optional[_models.StorageAccount]:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> Iterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -722,7 +721,7 @@ def _create_initial(
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-06-01"))
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
-        cls: ClsType[Optional[_models.StorageAccount]] = kwargs.pop("cls", None)
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
         _json = None
@@ -743,10 +742,10 @@ def _create_initial(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -754,12 +753,14 @@ def _create_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = None
-        if response.status_code == 200:
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -882,10 +883,11 @@ def begin_create(
                 params=_params,
                 **kwargs
             )
+            raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+            deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
             if cls:
                 return cls(pipeline_response, deserialized, {})  # type: ignore
             return deserialized
@@ -924,7 +926,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,
@@ -946,7 +948,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -991,7 +992,7 @@ def get_properties(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1014,7 +1015,6 @@ def get_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1028,7 +1028,7 @@ def get_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1139,7 +1139,7 @@ def update(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1173,7 +1173,6 @@ def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1187,7 +1186,7 @@ def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1209,7 +1208,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.StorageAccount"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-06-01"))
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1226,7 +1225,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -1242,7 +1240,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -1289,7 +1286,7 @@ def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> Ite
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-06-01"))
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1307,7 +1304,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -1323,7 +1319,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -1373,7 +1368,7 @@ def list_keys(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.StorageAccountListKeysResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1396,7 +1391,6 @@ def list_keys(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1410,7 +1404,7 @@ def list_keys(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response)
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1504,7 +1498,7 @@ def regenerate_key(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.StorageAccountListKeysResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1538,7 +1532,6 @@ def regenerate_key(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1552,7 +1545,7 @@ def regenerate_key(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response)
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1643,7 +1636,7 @@ def list_account_sas(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.ListAccountSasResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1677,7 +1670,6 @@ def list_account_sas(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1691,7 +1683,7 @@ def list_account_sas(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListAccountSasResponse", pipeline_response)
+        deserialized = self._deserialize("ListAccountSasResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1780,7 +1772,7 @@ def list_service_sas(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.ListServiceSasResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1814,7 +1806,6 @@ def list_service_sas(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1828,17 +1819,15 @@ def list_service_sas(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListServiceSasResponse", pipeline_response)
+        deserialized = self._deserialize("ListServiceSasResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
 
         return deserialized  # type: ignore
 
-    def _failover_initial(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, **kwargs: Any
-    ) -> None:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    def _failover_initial(self, resource_group_name: str, account_name: str, **kwargs: Any) -> Iterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1850,7 +1839,7 @@ def _failover_initial(  # pylint: disable=inconsistent-return-statements
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-06-01"))
-        cls: ClsType[None] = kwargs.pop("cls", None)
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
 
         _request = build_failover_request(
             resource_group_name=resource_group_name,
@@ -1860,10 +1849,10 @@ def _failover_initial(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -1871,11 +1860,19 @@ def _failover_initial(  # pylint: disable=inconsistent-return-statements
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
-            return cls(pipeline_response, None, {})  # type: ignore
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
 
     @distributed_trace
     def begin_failover(self, resource_group_name: str, account_name: str, **kwargs: Any) -> LROPoller[None]:
@@ -1903,7 +1900,7 @@ def begin_failover(self, resource_group_name: str, account_name: str, **kwargs:
         lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
         cont_token: Optional[str] = kwargs.pop("continuation_token", None)
         if cont_token is None:
-            raw_result = self._failover_initial(  # type: ignore
+            raw_result = self._failover_initial(
                 resource_group_name=resource_group_name,
                 account_name=account_name,
                 api_version=api_version,
@@ -1912,6 +1909,7 @@ def begin_failover(self, resource_group_name: str, account_name: str, **kwargs:
                 params=_params,
                 **kwargs
             )
+            raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
@@ -1935,10 +1933,10 @@ def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-
             )
         return LROPoller[None](self._client, raw_result, get_long_running_output, polling_method)  # type: ignore
 
-    def _hierarchical_namespace_migration_initial(  # pylint: disable=inconsistent-return-statements,name-too-long
+    def _hierarchical_namespace_migration_initial(  # pylint: disable=name-too-long
         self, resource_group_name: str, account_name: str, request_type: str, **kwargs: Any
-    ) -> None:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> Iterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1950,7 +1948,7 @@ def _hierarchical_namespace_migration_initial(  # pylint: disable=inconsistent-r
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-06-01"))
-        cls: ClsType[None] = kwargs.pop("cls", None)
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
 
         _request = build_hierarchical_namespace_migration_request(
             resource_group_name=resource_group_name,
@@ -1961,10 +1959,10 @@ def _hierarchical_namespace_migration_initial(  # pylint: disable=inconsistent-r
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -1972,12 +1970,20 @@ def _hierarchical_namespace_migration_initial(  # pylint: disable=inconsistent-r
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
-            return cls(pipeline_response, None, {})  # type: ignore
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
 
     @distributed_trace
     def begin_hierarchical_namespace_migration(
@@ -2010,7 +2016,7 @@ def begin_hierarchical_namespace_migration(
         lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
         cont_token: Optional[str] = kwargs.pop("continuation_token", None)
         if cont_token is None:
-            raw_result = self._hierarchical_namespace_migration_initial(  # type: ignore
+            raw_result = self._hierarchical_namespace_migration_initial(
                 resource_group_name=resource_group_name,
                 account_name=account_name,
                 request_type=request_type,
@@ -2020,6 +2026,7 @@ def begin_hierarchical_namespace_migration(
                 params=_params,
                 **kwargs
             )
+            raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
@@ -2043,10 +2050,10 @@ def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-
             )
         return LROPoller[None](self._client, raw_result, get_long_running_output, polling_method)  # type: ignore
 
-    def _abort_hierarchical_namespace_migration_initial(  # pylint: disable=inconsistent-return-statements,name-too-long
+    def _abort_hierarchical_namespace_migration_initial(  # pylint: disable=name-too-long
         self, resource_group_name: str, account_name: str, **kwargs: Any
-    ) -> None:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> Iterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -2058,7 +2065,7 @@ def _abort_hierarchical_namespace_migration_initial(  # pylint: disable=inconsis
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-06-01"))
-        cls: ClsType[None] = kwargs.pop("cls", None)
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
 
         _request = build_abort_hierarchical_namespace_migration_request(
             resource_group_name=resource_group_name,
@@ -2068,10 +2075,10 @@ def _abort_hierarchical_namespace_migration_initial(  # pylint: disable=inconsis
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -2079,12 +2086,20 @@ def _abort_hierarchical_namespace_migration_initial(  # pylint: disable=inconsis
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
-            return cls(pipeline_response, None, {})  # type: ignore
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
 
     @distributed_trace
     def begin_abort_hierarchical_namespace_migration(  # pylint: disable=name-too-long
@@ -2112,7 +2127,7 @@ def begin_abort_hierarchical_namespace_migration(  # pylint: disable=name-too-lo
         lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
         cont_token: Optional[str] = kwargs.pop("continuation_token", None)
         if cont_token is None:
-            raw_result = self._abort_hierarchical_namespace_migration_initial(  # type: ignore
+            raw_result = self._abort_hierarchical_namespace_migration_initial(
                 resource_group_name=resource_group_name,
                 account_name=account_name,
                 api_version=api_version,
@@ -2121,6 +2136,7 @@ def begin_abort_hierarchical_namespace_migration(  # pylint: disable=name-too-lo
                 params=_params,
                 **kwargs
             )
+            raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
@@ -2150,8 +2166,8 @@ def _restore_blob_ranges_initial(
         account_name: str,
         parameters: Union[_models.BlobRestoreParameters, IO[bytes]],
         **kwargs: Any
-    ) -> _models.BlobRestoreStatus:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> Iterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -2164,7 +2180,7 @@ def _restore_blob_ranges_initial(
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-06-01"))
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
-        cls: ClsType[_models.BlobRestoreStatus] = kwargs.pop("cls", None)
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
         _json = None
@@ -2185,10 +2201,10 @@ def _restore_blob_ranges_initial(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -2196,14 +2212,14 @@ def _restore_blob_ranges_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response)
-
-        if response.status_code == 202:
-            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response)
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -2316,10 +2332,11 @@ def begin_restore_blob_ranges(
                 params=_params,
                 **kwargs
             )
+            raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):
-            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response)
+            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response.http_response)
             if cls:
                 return cls(pipeline_response, deserialized, {})  # type: ignore
             return deserialized
@@ -2360,7 +2377,7 @@ def revoke_user_delegation_keys(  # pylint: disable=inconsistent-return-statemen
         :rtype: None
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -2382,7 +2399,6 @@ def revoke_user_delegation_keys(  # pylint: disable=inconsistent-return-statemen
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/operations/_table_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/operations/_table_operations.py
index ce22e2629fa1..f5a48052ebfa 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/operations/_table_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/operations/_table_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 (
@@ -20,20 +19,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -255,7 +252,7 @@ def create(self, resource_group_name: str, account_name: str, table_name: str, *
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.Table
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -278,7 +275,6 @@ def create(self, resource_group_name: str, account_name: str, table_name: str, *
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -293,7 +289,7 @@ def create(self, resource_group_name: str, account_name: str, table_name: str, *
             error = self._deserialize.failsafe_deserialize(_models.CloudErrorAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("Table", pipeline_response)
+        deserialized = self._deserialize("Table", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -319,7 +315,7 @@ def update(self, resource_group_name: str, account_name: str, table_name: str, *
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.Table
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -342,7 +338,6 @@ def update(self, resource_group_name: str, account_name: str, table_name: str, *
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -357,7 +352,7 @@ def update(self, resource_group_name: str, account_name: str, table_name: str, *
             error = self._deserialize.failsafe_deserialize(_models.CloudErrorAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("Table", pipeline_response)
+        deserialized = self._deserialize("Table", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -383,7 +378,7 @@ def get(self, resource_group_name: str, account_name: str, table_name: str, **kw
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.Table
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -406,7 +401,6 @@ def get(self, resource_group_name: str, account_name: str, table_name: str, **kw
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -421,7 +415,7 @@ def get(self, resource_group_name: str, account_name: str, table_name: str, **kw
             error = self._deserialize.failsafe_deserialize(_models.CloudErrorAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("Table", pipeline_response)
+        deserialized = self._deserialize("Table", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -449,7 +443,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,
@@ -472,7 +466,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -511,7 +504,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> It
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-06-01"))
         cls: ClsType[_models.ListTableResource] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -530,7 +523,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -546,7 +538,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/operations/_table_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/operations/_table_services_operations.py
index 8801a3709803..5ad86537c251 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/operations/_table_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/operations/_table_services_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, Literal, Optional, Type, TypeVar, Union, overload
+from typing import Any, Callable, Dict, IO, Literal, Optional, TypeVar, Union, overload
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -19,20 +18,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -179,7 +176,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.ListTableServices
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -201,7 +198,6 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -216,7 +212,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
             error = self._deserialize.failsafe_deserialize(_models.CloudErrorAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListTableServices", pipeline_response)
+        deserialized = self._deserialize("ListTableServices", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -311,7 +307,7 @@ def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.TableServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -347,7 +343,6 @@ def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -362,7 +357,7 @@ def set_service_properties(
             error = self._deserialize.failsafe_deserialize(_models.CloudErrorAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("TableServiceProperties", pipeline_response)
+        deserialized = self._deserialize("TableServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -387,7 +382,7 @@ def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_06_01.models.TableServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -411,7 +406,6 @@ def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -426,7 +420,7 @@ def get_service_properties(
             error = self._deserialize.failsafe_deserialize(_models.CloudErrorAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("TableServiceProperties", pipeline_response)
+        deserialized = self._deserialize("TableServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/operations/_usages_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/operations/_usages_operations.py
index 4a3c9d02bd25..74be8fe98150 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/operations/_usages_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_06_01/operations/_usages_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 (
@@ -20,20 +19,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -105,7 +102,7 @@ def list_by_location(self, location: str, **kwargs: Any) -> Iterable["_models.Us
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-06-01"))
         cls: ClsType[_models.UsageListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -123,7 +120,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -139,7 +135,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/__init__.py
index a860a5c185c9..60980065e1ee 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/__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 ._storage_management_client import StorageManagementClient
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._storage_management_client import StorageManagementClient  # 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__ = [
     "StorageManagementClient",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/_configuration.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/_configuration.py
index 66be34441ed7..1de9c74c4dda 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/_configuration.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/_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 StorageManagementClientConfiguration:  # pylint: disable=too-many-instance-attributes,name-too-long
+class StorageManagementClientConfiguration:  # pylint: disable=too-many-instance-attributes
     """Configuration for StorageManagementClient.
 
     Note that all parameters used to create this instance are saved as instance
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/_metadata.json b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/_metadata.json
index 0feb8c85b60d..b703b9d865a4 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/_metadata.json
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/_metadata.json
@@ -10,8 +10,8 @@
         "azure_arm": true,
         "has_public_lro_operations": true,
         "client_side_validation": false,
-        "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"ARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementClientConfiguration\"], \".._serialization\": [\"Deserializer\", \"Serializer\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}}",
-        "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"AsyncARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"AsyncARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementClientConfiguration\"], \"..._serialization\": [\"Deserializer\", \"Serializer\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"]}}}"
+        "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"ARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementClientConfiguration\"], \".._serialization\": [\"Deserializer\", \"Serializer\"]}, \"stdlib\": {\"typing_extensions\": [\"Self\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}}",
+        "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"AsyncARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"AsyncARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementClientConfiguration\"], \"..._serialization\": [\"Deserializer\", \"Serializer\"]}, \"stdlib\": {\"typing_extensions\": [\"Self\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"]}}}"
     },
     "global_parameters": {
         "sync": {
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/_storage_management_client.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/_storage_management_client.py
index 08ff81b2be8e..623ab156e0af 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/_storage_management_client.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/_storage_management_client.py
@@ -8,6 +8,7 @@
 
 from copy import deepcopy
 from typing import Any, TYPE_CHECKING
+from typing_extensions import Self
 
 from azure.core.pipeline import policies
 from azure.core.rest import HttpRequest, HttpResponse
@@ -41,11 +42,10 @@
 )
 
 if TYPE_CHECKING:
-    # pylint: disable=unused-import,ungrouped-imports
     from azure.core.credentials import TokenCredential
 
 
-class StorageManagementClient:  # pylint: disable=client-accepts-api-version-keyword,too-many-instance-attributes
+class StorageManagementClient:  # pylint: disable=too-many-instance-attributes
     """The Azure Storage Management API.
 
     :ivar operations: Operations operations
@@ -217,7 +217,7 @@ def _send_request(self, request: HttpRequest, *, stream: bool = False, **kwargs:
     def close(self) -> None:
         self._client.close()
 
-    def __enter__(self) -> "StorageManagementClient":
+    def __enter__(self) -> Self:
         self._client.__enter__()
         return self
 
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/_vendor.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/_vendor.py
deleted file mode 100644
index 0dafe0e287ff..000000000000
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/_vendor.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# --------------------------------------------------------------------------
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License. See License.txt in the project root for license information.
-# Code generated by Microsoft (R) AutoRest Code Generator.
-# Changes may cause incorrect behavior and will be lost if the code is regenerated.
-# --------------------------------------------------------------------------
-
-from azure.core.pipeline.transport import HttpRequest
-
-
-def _convert_request(request, files=None):
-    data = request.content if not files else None
-    request = HttpRequest(method=request.method, url=request.url, headers=request.headers, data=data)
-    if files:
-        request.set_formdata_body(files)
-    return request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/_version.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/_version.py
index 5a163c0afedc..e5754a47ce68 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/_version.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/_version.py
@@ -6,4 +6,4 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-VERSION = "21.2.1"
\ No newline at end of file
+VERSION = "1.0.0b1"
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/__init__.py
index a5c3d2414cfd..ee2b940bd4fc 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/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 ._storage_management_client import StorageManagementClient
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._storage_management_client import StorageManagementClient  # 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__ = [
     "StorageManagementClient",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/_configuration.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/_configuration.py
index 7b440e630a90..4c1e2f028d16 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/_configuration.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/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 StorageManagementClientConfiguration:  # pylint: disable=too-many-instance-attributes,name-too-long
+class StorageManagementClientConfiguration:  # pylint: disable=too-many-instance-attributes
     """Configuration for StorageManagementClient.
 
     Note that all parameters used to create this instance are saved as instance
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/_storage_management_client.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/_storage_management_client.py
index 7ca4b87dd0ad..9882fb41be60 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/_storage_management_client.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/_storage_management_client.py
@@ -8,6 +8,7 @@
 
 from copy import deepcopy
 from typing import Any, Awaitable, TYPE_CHECKING
+from typing_extensions import Self
 
 from azure.core.pipeline import policies
 from azure.core.rest import AsyncHttpResponse, HttpRequest
@@ -41,11 +42,10 @@
 )
 
 if TYPE_CHECKING:
-    # pylint: disable=unused-import,ungrouped-imports
     from azure.core.credentials_async import AsyncTokenCredential
 
 
-class StorageManagementClient:  # pylint: disable=client-accepts-api-version-keyword,too-many-instance-attributes
+class StorageManagementClient:  # pylint: disable=too-many-instance-attributes
     """The Azure Storage Management API.
 
     :ivar operations: Operations operations
@@ -222,7 +222,7 @@ def _send_request(
     async def close(self) -> None:
         await self._client.close()
 
-    async def __aenter__(self) -> "StorageManagementClient":
+    async def __aenter__(self) -> Self:
         await self._client.__aenter__()
         return self
 
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/operations/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/operations/__init__.py
index bbce85749d18..a0549517e087 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/operations/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/operations/__init__.py
@@ -5,30 +5,36 @@
 # 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 ._skus_operations import SkusOperations
-from ._storage_accounts_operations import StorageAccountsOperations
-from ._deleted_accounts_operations import DeletedAccountsOperations
-from ._usages_operations import UsagesOperations
-from ._management_policies_operations import ManagementPoliciesOperations
-from ._blob_inventory_policies_operations import BlobInventoryPoliciesOperations
-from ._private_endpoint_connections_operations import PrivateEndpointConnectionsOperations
-from ._private_link_resources_operations import PrivateLinkResourcesOperations
-from ._object_replication_policies_operations import ObjectReplicationPoliciesOperations
-from ._local_users_operations import LocalUsersOperations
-from ._encryption_scopes_operations import EncryptionScopesOperations
-from ._blob_services_operations import BlobServicesOperations
-from ._blob_containers_operations import BlobContainersOperations
-from ._file_services_operations import FileServicesOperations
-from ._file_shares_operations import FileSharesOperations
-from ._queue_services_operations import QueueServicesOperations
-from ._queue_operations import QueueOperations
-from ._table_services_operations import TableServicesOperations
-from ._table_operations import TableOperations
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._operations import Operations  # type: ignore
+from ._skus_operations import SkusOperations  # type: ignore
+from ._storage_accounts_operations import StorageAccountsOperations  # type: ignore
+from ._deleted_accounts_operations import DeletedAccountsOperations  # type: ignore
+from ._usages_operations import UsagesOperations  # type: ignore
+from ._management_policies_operations import ManagementPoliciesOperations  # type: ignore
+from ._blob_inventory_policies_operations import BlobInventoryPoliciesOperations  # type: ignore
+from ._private_endpoint_connections_operations import PrivateEndpointConnectionsOperations  # type: ignore
+from ._private_link_resources_operations import PrivateLinkResourcesOperations  # type: ignore
+from ._object_replication_policies_operations import ObjectReplicationPoliciesOperations  # type: ignore
+from ._local_users_operations import LocalUsersOperations  # type: ignore
+from ._encryption_scopes_operations import EncryptionScopesOperations  # type: ignore
+from ._blob_services_operations import BlobServicesOperations  # type: ignore
+from ._blob_containers_operations import BlobContainersOperations  # type: ignore
+from ._file_services_operations import FileServicesOperations  # type: ignore
+from ._file_shares_operations import FileSharesOperations  # type: ignore
+from ._queue_services_operations import QueueServicesOperations  # type: ignore
+from ._queue_operations import QueueOperations  # type: ignore
+from ._table_services_operations import TableServicesOperations  # type: ignore
+from ._table_operations import TableOperations  # 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__ = [
@@ -53,5 +59,5 @@
     "TableServicesOperations",
     "TableOperations",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/operations/_blob_containers_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/operations/_blob_containers_operations.py
index 3c60276f45e0..42f1b1575dd8 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/operations/_blob_containers_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/operations/_blob_containers_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,20 @@
 # --------------------------------------------------------------------------
 from io import IOBase
 import sys
-from typing import Any, AsyncIterable, Callable, Dict, IO, Literal, Optional, Type, TypeVar, Union, cast, overload
+from typing import (
+    Any,
+    AsyncIterable,
+    AsyncIterator,
+    Callable,
+    Dict,
+    IO,
+    Literal,
+    Optional,
+    TypeVar,
+    Union,
+    cast,
+    overload,
+)
 import urllib.parse
 
 from azure.core.async_paging import AsyncItemPaged, AsyncList
@@ -18,12 +31,13 @@
     ResourceExistsError,
     ResourceNotFoundError,
     ResourceNotModifiedError,
+    StreamClosedError,
+    StreamConsumedError,
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
 from azure.core.polling import AsyncLROPoller, AsyncNoPolling, AsyncPollingMethod
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
@@ -31,7 +45,6 @@
 from azure.mgmt.core.polling.async_arm_polling import AsyncARMPolling
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._blob_containers_operations import (
     build_clear_legal_hold_request,
     build_create_or_update_immutability_policy_request,
@@ -52,7 +65,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]]
 
@@ -117,7 +130,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-08-01"))
         cls: ClsType[_models.ListContainerItems] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -139,7 +152,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -155,7 +167,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -290,7 +301,7 @@ async def create(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -325,7 +336,6 @@ async def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -339,11 +349,7 @@ async def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("BlobContainer", pipeline_response)
-
-        if response.status_code == 201:
-            deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -453,7 +459,7 @@ async def update(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -488,7 +494,6 @@ async def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -502,7 +507,7 @@ async def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -531,7 +536,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -554,7 +559,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -568,7 +572,7 @@ async def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -576,9 +580,7 @@ async def get(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, container_name: str, **kwargs: Any
-    ) -> None:
+    async def delete(self, resource_group_name: str, account_name: str, container_name: str, **kwargs: Any) -> None:
         """Deletes specified container under its account.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -597,7 +599,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,
@@ -620,7 +622,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -743,7 +744,7 @@ async def set_legal_hold(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.LegalHold
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -778,7 +779,6 @@ async def set_legal_hold(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -792,7 +792,7 @@ async def set_legal_hold(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LegalHold", pipeline_response)
+        deserialized = self._deserialize("LegalHold", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -902,7 +902,7 @@ async def clear_legal_hold(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.LegalHold
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -937,7 +937,6 @@ async def clear_legal_hold(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -951,7 +950,7 @@ async def clear_legal_hold(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LegalHold", pipeline_response)
+        deserialized = self._deserialize("LegalHold", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1078,7 +1077,7 @@ async def create_or_update_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1119,7 +1118,6 @@ async def create_or_update_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1136,7 +1134,7 @@ async def create_or_update_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1175,7 +1173,7 @@ async def get_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1201,7 +1199,6 @@ async def get_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1218,7 +1215,7 @@ async def get_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1254,7 +1251,7 @@ async def delete_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1280,7 +1277,6 @@ async def delete_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1297,7 +1293,7 @@ async def delete_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1331,7 +1327,7 @@ async def lock_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1355,7 +1351,6 @@ async def lock_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1372,7 +1367,7 @@ async def lock_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1502,7 +1497,7 @@ async def extend_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1541,7 +1536,6 @@ async def extend_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1558,7 +1552,7 @@ async def extend_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1668,7 +1662,7 @@ async def lease(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.LeaseContainerResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1706,7 +1700,6 @@ async def lease(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1720,17 +1713,17 @@ async def lease(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LeaseContainerResponse", pipeline_response)
+        deserialized = self._deserialize("LeaseContainerResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
 
         return deserialized  # type: ignore
 
-    async def _object_level_worm_initial(  # pylint: disable=inconsistent-return-statements
+    async def _object_level_worm_initial(
         self, resource_group_name: str, account_name: str, container_name: str, **kwargs: Any
-    ) -> None:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1742,7 +1735,7 @@ async def _object_level_worm_initial(  # pylint: disable=inconsistent-return-sta
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-08-01"))
-        cls: ClsType[None] = kwargs.pop("cls", None)
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
 
         _request = build_object_level_worm_request(
             resource_group_name=resource_group_name,
@@ -1753,10 +1746,10 @@ async def _object_level_worm_initial(  # pylint: disable=inconsistent-return-sta
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -1764,11 +1757,19 @@ async def _object_level_worm_initial(  # pylint: disable=inconsistent-return-sta
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
-            return cls(pipeline_response, None, {})  # type: ignore
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
 
     @distributed_trace_async
     async def begin_object_level_worm(
@@ -1804,7 +1805,7 @@ async def begin_object_level_worm(
         lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
         cont_token: Optional[str] = kwargs.pop("continuation_token", None)
         if cont_token is None:
-            raw_result = await self._object_level_worm_initial(  # type: ignore
+            raw_result = await self._object_level_worm_initial(
                 resource_group_name=resource_group_name,
                 account_name=account_name,
                 container_name=container_name,
@@ -1814,6 +1815,7 @@ async def begin_object_level_worm(
                 params=_params,
                 **kwargs
             )
+            await raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/operations/_blob_inventory_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/operations/_blob_inventory_policies_operations.py
index 3bf3ad5af3ec..4bcb8faaa3f9 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/operations/_blob_inventory_policies_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/operations/_blob_inventory_policies_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._blob_inventory_policies_operations import (
     build_create_or_update_request,
     build_delete_request,
@@ -40,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]]
 
@@ -90,7 +87,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.BlobInventoryPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -113,7 +110,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -128,7 +124,7 @@ async def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response)
+        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -232,7 +228,7 @@ async def create_or_update(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.BlobInventoryPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -267,7 +263,6 @@ async def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -282,7 +277,7 @@ async def create_or_update(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response)
+        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -290,7 +285,7 @@ async def create_or_update(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
+    async def delete(
         self,
         resource_group_name: str,
         account_name: str,
@@ -314,7 +309,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,
@@ -337,7 +332,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -379,7 +373,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-08-01"))
         cls: ClsType[_models.ListBlobInventoryPolicy] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -398,7 +392,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -414,7 +407,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/operations/_blob_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/operations/_blob_services_operations.py
index 252df2f9d0b5..b83fea307646 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/operations/_blob_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/operations/_blob_services_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, Literal, Optional, Type, TypeVar, Union, overload
+from typing import Any, AsyncIterable, Callable, Dict, IO, Literal, Optional, TypeVar, Union, overload
 import urllib.parse
 
 from azure.core.async_paging import AsyncItemPaged, AsyncList
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._blob_services_operations import (
     build_get_service_properties_request,
     build_list_request,
@@ -39,7 +36,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 +86,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-08-01"))
         cls: ClsType[_models.BlobServiceItems] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -108,7 +105,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -124,7 +120,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -241,7 +236,7 @@ async def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.BlobServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -277,7 +272,6 @@ async def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -291,7 +285,7 @@ async def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobServiceProperties", pipeline_response)
+        deserialized = self._deserialize("BlobServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -316,7 +310,7 @@ async def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.BlobServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -340,7 +334,6 @@ async def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -354,7 +347,7 @@ async def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobServiceProperties", pipeline_response)
+        deserialized = self._deserialize("BlobServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/operations/_deleted_accounts_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/operations/_deleted_accounts_operations.py
index e78e783dcaf4..e4dcb271399b 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/operations/_deleted_accounts_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/operations/_deleted_accounts_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
@@ -20,21 +19,19 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._deleted_accounts_operations import build_get_request, build_list_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
 
@@ -74,7 +71,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.DeletedAccount"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-08-01"))
         cls: ClsType[_models.DeletedAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -91,7 +88,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -107,7 +103,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -149,7 +144,7 @@ async def get(self, deleted_account_name: str, location: str, **kwargs: Any) ->
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.DeletedAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -171,7 +166,6 @@ async def get(self, deleted_account_name: str, location: str, **kwargs: Any) ->
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -186,7 +180,7 @@ async def get(self, deleted_account_name: str, location: str, **kwargs: Any) ->
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("DeletedAccount", pipeline_response)
+        deserialized = self._deserialize("DeletedAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/operations/_encryption_scopes_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/operations/_encryption_scopes_operations.py
index fbcf6f0d9ae7..6c2c4ced9137 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/operations/_encryption_scopes_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/operations/_encryption_scopes_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._encryption_scopes_operations import (
     build_get_request,
     build_list_request,
@@ -40,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]]
 
@@ -173,7 +170,7 @@ async def put(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.EncryptionScope
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -208,7 +205,6 @@ async def put(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -223,11 +219,7 @@ async def put(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("EncryptionScope", pipeline_response)
-
-        if response.status_code == 201:
-            deserialized = self._deserialize("EncryptionScope", pipeline_response)
+        deserialized = self._deserialize("EncryptionScope", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -337,7 +329,7 @@ async def patch(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.EncryptionScope
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -372,7 +364,6 @@ async def patch(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -387,7 +378,7 @@ async def patch(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("EncryptionScope", pipeline_response)
+        deserialized = self._deserialize("EncryptionScope", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -416,7 +407,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.EncryptionScope
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -439,7 +430,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -454,7 +444,7 @@ async def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("EncryptionScope", pipeline_response)
+        deserialized = self._deserialize("EncryptionScope", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -485,7 +475,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-08-01"))
         cls: ClsType[_models.EncryptionScopeListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -504,7 +494,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -520,7 +509,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/operations/_file_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/operations/_file_services_operations.py
index fdf62a856d2f..fea3295b51be 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/operations/_file_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/operations/_file_services_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, Literal, Optional, Type, TypeVar, Union, overload
+from typing import Any, Callable, Dict, IO, Literal, Optional, TypeVar, Union, overload
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -19,14 +18,12 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._file_services_operations import (
     build_get_service_properties_request,
     build_list_request,
@@ -36,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]]
 
@@ -76,7 +73,7 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.FileServiceItems
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -98,7 +95,6 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -112,7 +108,7 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileServiceItems", pipeline_response)
+        deserialized = self._deserialize("FileServiceItems", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -207,7 +203,7 @@ async def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.FileServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -243,7 +239,6 @@ async def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -257,7 +252,7 @@ async def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileServiceProperties", pipeline_response)
+        deserialized = self._deserialize("FileServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -282,7 +277,7 @@ async def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.FileServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -306,7 +301,6 @@ async def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -320,7 +314,7 @@ async def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileServiceProperties", pipeline_response)
+        deserialized = self._deserialize("FileServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/operations/_file_shares_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/operations/_file_shares_operations.py
index 196ed2f027d8..812ed784f934 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/operations/_file_shares_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/operations/_file_shares_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._file_shares_operations import (
     build_create_request,
     build_delete_request,
@@ -43,7 +40,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]]
 
@@ -108,7 +105,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-08-01"))
         cls: ClsType[_models.FileShareItems] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -130,7 +127,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -146,7 +142,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -293,7 +288,7 @@ async def create(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.FileShare
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -329,7 +324,6 @@ async def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -343,11 +337,7 @@ async def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("FileShare", pipeline_response)
-
-        if response.status_code == 201:
-            deserialized = self._deserialize("FileShare", pipeline_response)
+        deserialized = self._deserialize("FileShare", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -457,7 +447,7 @@ async def update(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.FileShare
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -492,7 +482,6 @@ async def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -506,7 +495,7 @@ async def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileShare", pipeline_response)
+        deserialized = self._deserialize("FileShare", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -547,7 +536,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.FileShare
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -572,7 +561,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -586,7 +574,7 @@ async def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileShare", pipeline_response)
+        deserialized = self._deserialize("FileShare", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -594,7 +582,7 @@ async def get(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
+    async def delete(
         self,
         resource_group_name: str,
         account_name: str,
@@ -631,7 +619,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,
@@ -656,7 +644,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -674,7 +661,7 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             return cls(pipeline_response, None, {})  # type: ignore
 
     @overload
-    async def restore(  # pylint: disable=inconsistent-return-statements
+    async def restore(
         self,
         resource_group_name: str,
         account_name: str,
@@ -709,7 +696,7 @@ async def restore(  # pylint: disable=inconsistent-return-statements
         """
 
     @overload
-    async def restore(  # pylint: disable=inconsistent-return-statements
+    async def restore(
         self,
         resource_group_name: str,
         account_name: str,
@@ -744,7 +731,7 @@ async def restore(  # pylint: disable=inconsistent-return-statements
         """
 
     @distributed_trace_async
-    async def restore(  # pylint: disable=inconsistent-return-statements
+    async def restore(
         self,
         resource_group_name: str,
         account_name: str,
@@ -772,7 +759,7 @@ async def restore(  # 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,
@@ -807,7 +794,6 @@ async def restore(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -939,7 +925,7 @@ async def lease(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.LeaseShareResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -978,7 +964,6 @@ async def lease(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -995,7 +980,7 @@ async def lease(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("LeaseShareResponse", pipeline_response)
+        deserialized = self._deserialize("LeaseShareResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/operations/_local_users_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/operations/_local_users_operations.py
index 88ad058e449a..4e56e496e4bf 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/operations/_local_users_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/operations/_local_users_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._local_users_operations import (
     build_create_or_update_request,
     build_delete_request,
@@ -42,7 +39,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 +86,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> As
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-08-01"))
         cls: ClsType[_models.LocalUsers] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -108,7 +105,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -124,7 +120,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -172,7 +167,7 @@ async def get(self, resource_group_name: str, account_name: str, username: str,
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.LocalUser
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -195,7 +190,6 @@ async def get(self, resource_group_name: str, account_name: str, username: str,
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -210,7 +204,7 @@ async def get(self, resource_group_name: str, account_name: str, username: str,
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LocalUser", pipeline_response)
+        deserialized = self._deserialize("LocalUser", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -311,7 +305,7 @@ async def create_or_update(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.LocalUser
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -346,7 +340,6 @@ async def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -361,7 +354,7 @@ async def create_or_update(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LocalUser", pipeline_response)
+        deserialized = self._deserialize("LocalUser", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -369,9 +362,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, account_name: str, username: str, **kwargs: Any
-    ) -> None:
+    async def delete(self, resource_group_name: str, account_name: str, username: str, **kwargs: Any) -> None:
         """Deletes the local user associated with the specified storage account.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -388,7 +379,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,
@@ -411,7 +402,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -449,7 +439,7 @@ async def list_keys(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.LocalUserKeys
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -472,7 +462,6 @@ async def list_keys(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -487,7 +476,7 @@ async def list_keys(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LocalUserKeys", pipeline_response)
+        deserialized = self._deserialize("LocalUserKeys", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -514,7 +503,7 @@ async def regenerate_password(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.LocalUserRegeneratePasswordResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -537,7 +526,6 @@ async def regenerate_password(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -552,7 +540,7 @@ async def regenerate_password(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LocalUserRegeneratePasswordResult", pipeline_response)
+        deserialized = self._deserialize("LocalUserRegeneratePasswordResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/operations/_management_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/operations/_management_policies_operations.py
index 9d8de1146a7d..dc05cc091a59 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/operations/_management_policies_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/operations/_management_policies_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,
@@ -19,14 +18,12 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._management_policies_operations import (
     build_create_or_update_request,
     build_delete_request,
@@ -36,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]]
 
@@ -86,7 +83,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.ManagementPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -109,7 +106,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -123,7 +119,7 @@ async def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ManagementPolicy", pipeline_response)
+        deserialized = self._deserialize("ManagementPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -227,7 +223,7 @@ async def create_or_update(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.ManagementPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -262,7 +258,6 @@ async def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -276,7 +271,7 @@ async def create_or_update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ManagementPolicy", pipeline_response)
+        deserialized = self._deserialize("ManagementPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -284,7 +279,7 @@ async def create_or_update(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
+    async def delete(
         self,
         resource_group_name: str,
         account_name: str,
@@ -308,7 +303,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,
@@ -331,7 +326,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/operations/_object_replication_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/operations/_object_replication_policies_operations.py
index 02f797f0caa0..7c25d5cb8b59 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/operations/_object_replication_policies_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/operations/_object_replication_policies_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._object_replication_policies_operations import (
     build_create_or_update_request,
     build_delete_request,
@@ -40,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]]
 
@@ -90,7 +87,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-08-01"))
         cls: ClsType[_models.ObjectReplicationPolicies] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -109,7 +106,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -125,7 +121,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -177,7 +172,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.ObjectReplicationPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -200,7 +195,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -215,7 +209,7 @@ async def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response)
+        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -325,7 +319,7 @@ async def create_or_update(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.ObjectReplicationPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -360,7 +354,6 @@ async def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -375,7 +368,7 @@ async def create_or_update(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response)
+        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -383,7 +376,7 @@ async def create_or_update(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
+    async def delete(
         self, resource_group_name: str, account_name: str, object_replication_policy_id: str, **kwargs: Any
     ) -> None:
         """Deletes the object replication policy associated with the specified storage account.
@@ -404,7 +397,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,
@@ -427,7 +420,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/operations/_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/operations/_operations.py
index ea25226df226..fd80dcc0a15e 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/operations/_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/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
@@ -20,20 +19,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._operations import build_list_request
 
 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]]
 
@@ -73,7 +70,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.Operation"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-08-01"))
         cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -89,7 +86,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -105,7 +101,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/operations/_private_endpoint_connections_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/operations/_private_endpoint_connections_operations.py
index bd29831dca33..ab5fa05ad4dd 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/operations/_private_endpoint_connections_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/operations/_private_endpoint_connections_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._private_endpoint_connections_operations import (
     build_delete_request,
     build_get_request,
@@ -40,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]]
 
@@ -90,7 +87,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-08-01"))
         cls: ClsType[_models.PrivateEndpointConnectionListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -109,7 +106,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -125,7 +121,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -174,7 +169,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.PrivateEndpointConnection
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -197,7 +192,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -212,7 +206,7 @@ async def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response)
+        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -313,7 +307,7 @@ async def put(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.PrivateEndpointConnection
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -348,7 +342,6 @@ async def put(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -363,7 +356,7 @@ async def put(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response)
+        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -371,7 +364,7 @@ async def put(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
+    async def delete(
         self, resource_group_name: str, account_name: str, private_endpoint_connection_name: str, **kwargs: Any
     ) -> None:
         """Deletes the specified private endpoint connection associated with the storage account.
@@ -390,7 +383,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,
@@ -413,7 +406,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/operations/_private_link_resources_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/operations/_private_link_resources_operations.py
index caf48f3dca5c..8b682851c5ec 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/operations/_private_link_resources_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/operations/_private_link_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, Optional, Type, TypeVar
+from typing import Any, Callable, Dict, Optional, TypeVar
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -18,20 +17,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._private_link_resources_operations import build_list_by_storage_account_request
 
 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]]
 
@@ -73,7 +70,7 @@ async def list_by_storage_account(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.PrivateLinkResourceListResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -95,7 +92,6 @@ async def list_by_storage_account(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -109,7 +105,7 @@ async def list_by_storage_account(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("PrivateLinkResourceListResult", pipeline_response)
+        deserialized = self._deserialize("PrivateLinkResourceListResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/operations/_queue_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/operations/_queue_operations.py
index b379ad307a7a..55af140fa625 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/operations/_queue_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/operations/_queue_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._queue_operations import (
     build_create_request,
     build_delete_request,
@@ -41,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]]
 
@@ -166,7 +163,7 @@ async def create(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.StorageQueue
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -201,7 +198,6 @@ async def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -215,7 +211,7 @@ async def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageQueue", pipeline_response)
+        deserialized = self._deserialize("StorageQueue", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -322,7 +318,7 @@ async def update(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.StorageQueue
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -357,7 +353,6 @@ async def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -371,7 +366,7 @@ async def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageQueue", pipeline_response)
+        deserialized = self._deserialize("StorageQueue", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -400,7 +395,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.StorageQueue
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -423,7 +418,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -437,7 +431,7 @@ async def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageQueue", pipeline_response)
+        deserialized = self._deserialize("StorageQueue", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -445,9 +439,7 @@ async def get(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, queue_name: str, **kwargs: Any
-    ) -> None:
+    async def delete(self, resource_group_name: str, account_name: str, queue_name: str, **kwargs: Any) -> None:
         """Deletes the queue with the specified queue name, under the specified account if it exists.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -466,7 +458,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,
@@ -489,7 +481,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -541,7 +532,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-08-01"))
         cls: ClsType[_models.ListQueueResource] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -562,7 +553,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -578,7 +568,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/operations/_queue_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/operations/_queue_services_operations.py
index 0eeccb2f2352..4085d6354290 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/operations/_queue_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/operations/_queue_services_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, Literal, Optional, Type, TypeVar, Union, overload
+from typing import Any, Callable, Dict, IO, Literal, Optional, TypeVar, Union, overload
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -19,14 +18,12 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._queue_services_operations import (
     build_get_service_properties_request,
     build_list_request,
@@ -36,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]]
 
@@ -76,7 +73,7 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.ListQueueServices
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -98,7 +95,6 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -112,7 +108,7 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListQueueServices", pipeline_response)
+        deserialized = self._deserialize("ListQueueServices", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -207,7 +203,7 @@ async def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.QueueServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -243,7 +239,6 @@ async def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -257,7 +252,7 @@ async def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("QueueServiceProperties", pipeline_response)
+        deserialized = self._deserialize("QueueServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -282,7 +277,7 @@ async def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.QueueServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -306,7 +301,6 @@ async def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -320,7 +314,7 @@ async def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("QueueServiceProperties", pipeline_response)
+        deserialized = self._deserialize("QueueServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/operations/_skus_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/operations/_skus_operations.py
index 8993bfbb841f..3d8134acb65f 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/operations/_skus_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/operations/_skus_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
@@ -20,20 +19,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._skus_operations import build_list_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
 
@@ -73,7 +70,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.SkuInformation"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-08-01"))
         cls: ClsType[_models.StorageSkuListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -90,7 +87,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -106,7 +102,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/operations/_storage_accounts_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/operations/_storage_accounts_operations.py
index b40b786af1d1..c4bd74c8f4ca 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/operations/_storage_accounts_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/operations/_storage_accounts_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,20 @@
 # --------------------------------------------------------------------------
 from io import IOBase
 import sys
-from typing import Any, AsyncIterable, Callable, Dict, IO, Literal, Optional, Type, TypeVar, Union, cast, overload
+from typing import (
+    Any,
+    AsyncIterable,
+    AsyncIterator,
+    Callable,
+    Dict,
+    IO,
+    Literal,
+    Optional,
+    TypeVar,
+    Union,
+    cast,
+    overload,
+)
 import urllib.parse
 
 from azure.core.async_paging import AsyncItemPaged, AsyncList
@@ -18,12 +31,13 @@
     ResourceExistsError,
     ResourceNotFoundError,
     ResourceNotModifiedError,
+    StreamClosedError,
+    StreamConsumedError,
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
 from azure.core.polling import AsyncLROPoller, AsyncNoPolling, AsyncPollingMethod
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
@@ -31,7 +45,6 @@
 from azure.mgmt.core.polling.async_arm_polling import AsyncARMPolling
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._storage_accounts_operations import (
     build_abort_hierarchical_namespace_migration_request,
     build_check_name_availability_request,
@@ -54,7 +67,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]]
 
@@ -137,7 +150,7 @@ async def check_name_availability(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.CheckNameAvailabilityResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -169,7 +182,6 @@ async def check_name_availability(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -183,7 +195,7 @@ async def check_name_availability(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response)
+        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -196,8 +208,8 @@ async def _create_initial(
         account_name: str,
         parameters: Union[_models.StorageAccountCreateParameters, IO[bytes]],
         **kwargs: Any
-    ) -> Optional[_models.StorageAccount]:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -210,7 +222,7 @@ async def _create_initial(
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-08-01"))
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
-        cls: ClsType[Optional[_models.StorageAccount]] = kwargs.pop("cls", None)
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
         _json = None
@@ -231,10 +243,10 @@ async def _create_initial(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -242,12 +254,14 @@ async def _create_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = None
-        if response.status_code == 200:
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -373,10 +387,11 @@ async def begin_create(
                 params=_params,
                 **kwargs
             )
+            await raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+            deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
             if cls:
                 return cls(pipeline_response, deserialized, {})  # type: ignore
             return deserialized
@@ -399,9 +414,7 @@ def get_long_running_output(pipeline_response):
         )
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, **kwargs: Any
-    ) -> None:
+    async def delete(self, resource_group_name: str, account_name: str, **kwargs: Any) -> None:
         """Deletes a storage account in Microsoft Azure.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -415,7 +428,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,
@@ -437,7 +450,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -482,7 +494,7 @@ async def get_properties(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -505,7 +517,6 @@ async def get_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -519,7 +530,7 @@ async def get_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -630,7 +641,7 @@ async def update(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -664,7 +675,6 @@ async def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -678,7 +688,7 @@ async def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -701,7 +711,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.StorageAccount"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-08-01"))
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -718,7 +728,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -734,7 +743,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -784,7 +792,7 @@ def list_by_resource_group(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-08-01"))
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -802,7 +810,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -818,7 +825,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -868,7 +874,7 @@ async def list_keys(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.StorageAccountListKeysResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -891,7 +897,6 @@ async def list_keys(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -905,7 +910,7 @@ async def list_keys(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response)
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -999,7 +1004,7 @@ async def regenerate_key(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.StorageAccountListKeysResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1033,7 +1038,6 @@ async def regenerate_key(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1047,7 +1051,7 @@ async def regenerate_key(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response)
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1138,7 +1142,7 @@ async def list_account_sas(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.ListAccountSasResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1172,7 +1176,6 @@ async def list_account_sas(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1186,7 +1189,7 @@ async def list_account_sas(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListAccountSasResponse", pipeline_response)
+        deserialized = self._deserialize("ListAccountSasResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1275,7 +1278,7 @@ async def list_service_sas(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.ListServiceSasResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1309,7 +1312,6 @@ async def list_service_sas(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1323,17 +1325,17 @@ async def list_service_sas(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListServiceSasResponse", pipeline_response)
+        deserialized = self._deserialize("ListServiceSasResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
 
         return deserialized  # type: ignore
 
-    async def _failover_initial(  # pylint: disable=inconsistent-return-statements
+    async def _failover_initial(
         self, resource_group_name: str, account_name: str, **kwargs: Any
-    ) -> None:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1345,7 +1347,7 @@ async def _failover_initial(  # pylint: disable=inconsistent-return-statements
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-08-01"))
-        cls: ClsType[None] = kwargs.pop("cls", None)
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
 
         _request = build_failover_request(
             resource_group_name=resource_group_name,
@@ -1355,10 +1357,10 @@ async def _failover_initial(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -1366,11 +1368,19 @@ async def _failover_initial(  # pylint: disable=inconsistent-return-statements
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
-            return cls(pipeline_response, None, {})  # type: ignore
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
 
     @distributed_trace_async
     async def begin_failover(self, resource_group_name: str, account_name: str, **kwargs: Any) -> AsyncLROPoller[None]:
@@ -1398,7 +1408,7 @@ async def begin_failover(self, resource_group_name: str, account_name: str, **kw
         lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
         cont_token: Optional[str] = kwargs.pop("continuation_token", None)
         if cont_token is None:
-            raw_result = await self._failover_initial(  # type: ignore
+            raw_result = await self._failover_initial(
                 resource_group_name=resource_group_name,
                 account_name=account_name,
                 api_version=api_version,
@@ -1407,6 +1417,7 @@ async def begin_failover(self, resource_group_name: str, account_name: str, **kw
                 params=_params,
                 **kwargs
             )
+            await raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
@@ -1430,10 +1441,10 @@ def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-
             )
         return AsyncLROPoller[None](self._client, raw_result, get_long_running_output, polling_method)  # type: ignore
 
-    async def _hierarchical_namespace_migration_initial(  # pylint: disable=inconsistent-return-statements,name-too-long
+    async def _hierarchical_namespace_migration_initial(  # pylint: disable=name-too-long
         self, resource_group_name: str, account_name: str, request_type: str, **kwargs: Any
-    ) -> None:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1445,7 +1456,7 @@ async def _hierarchical_namespace_migration_initial(  # pylint: disable=inconsis
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-08-01"))
-        cls: ClsType[None] = kwargs.pop("cls", None)
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
 
         _request = build_hierarchical_namespace_migration_request(
             resource_group_name=resource_group_name,
@@ -1456,10 +1467,10 @@ async def _hierarchical_namespace_migration_initial(  # pylint: disable=inconsis
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -1467,12 +1478,20 @@ async def _hierarchical_namespace_migration_initial(  # pylint: disable=inconsis
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
-            return cls(pipeline_response, None, {})  # type: ignore
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
 
     @distributed_trace_async
     async def begin_hierarchical_namespace_migration(
@@ -1505,7 +1524,7 @@ async def begin_hierarchical_namespace_migration(
         lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
         cont_token: Optional[str] = kwargs.pop("continuation_token", None)
         if cont_token is None:
-            raw_result = await self._hierarchical_namespace_migration_initial(  # type: ignore
+            raw_result = await self._hierarchical_namespace_migration_initial(
                 resource_group_name=resource_group_name,
                 account_name=account_name,
                 request_type=request_type,
@@ -1515,6 +1534,7 @@ async def begin_hierarchical_namespace_migration(
                 params=_params,
                 **kwargs
             )
+            await raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
@@ -1538,10 +1558,10 @@ def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-
             )
         return AsyncLROPoller[None](self._client, raw_result, get_long_running_output, polling_method)  # type: ignore
 
-    async def _abort_hierarchical_namespace_migration_initial(  # pylint: disable=inconsistent-return-statements,name-too-long
+    async def _abort_hierarchical_namespace_migration_initial(  # pylint: disable=name-too-long
         self, resource_group_name: str, account_name: str, **kwargs: Any
-    ) -> None:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1553,7 +1573,7 @@ async def _abort_hierarchical_namespace_migration_initial(  # pylint: disable=in
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-08-01"))
-        cls: ClsType[None] = kwargs.pop("cls", None)
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
 
         _request = build_abort_hierarchical_namespace_migration_request(
             resource_group_name=resource_group_name,
@@ -1563,10 +1583,10 @@ async def _abort_hierarchical_namespace_migration_initial(  # pylint: disable=in
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -1574,12 +1594,20 @@ async def _abort_hierarchical_namespace_migration_initial(  # pylint: disable=in
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
-            return cls(pipeline_response, None, {})  # type: ignore
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
 
     @distributed_trace_async
     async def begin_abort_hierarchical_namespace_migration(  # pylint: disable=name-too-long
@@ -1607,7 +1635,7 @@ async def begin_abort_hierarchical_namespace_migration(  # pylint: disable=name-
         lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
         cont_token: Optional[str] = kwargs.pop("continuation_token", None)
         if cont_token is None:
-            raw_result = await self._abort_hierarchical_namespace_migration_initial(  # type: ignore
+            raw_result = await self._abort_hierarchical_namespace_migration_initial(
                 resource_group_name=resource_group_name,
                 account_name=account_name,
                 api_version=api_version,
@@ -1616,6 +1644,7 @@ async def begin_abort_hierarchical_namespace_migration(  # pylint: disable=name-
                 params=_params,
                 **kwargs
             )
+            await raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
@@ -1645,8 +1674,8 @@ async def _restore_blob_ranges_initial(
         account_name: str,
         parameters: Union[_models.BlobRestoreParameters, IO[bytes]],
         **kwargs: Any
-    ) -> _models.BlobRestoreStatus:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1659,7 +1688,7 @@ async def _restore_blob_ranges_initial(
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-08-01"))
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
-        cls: ClsType[_models.BlobRestoreStatus] = kwargs.pop("cls", None)
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
         _json = None
@@ -1680,10 +1709,10 @@ async def _restore_blob_ranges_initial(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -1691,14 +1720,14 @@ async def _restore_blob_ranges_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response)
-
-        if response.status_code == 202:
-            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response)
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1814,10 +1843,11 @@ async def begin_restore_blob_ranges(
                 params=_params,
                 **kwargs
             )
+            await raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):
-            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response)
+            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response.http_response)
             if cls:
                 return cls(pipeline_response, deserialized, {})  # type: ignore
             return deserialized
@@ -1842,9 +1872,7 @@ def get_long_running_output(pipeline_response):
         )
 
     @distributed_trace_async
-    async def revoke_user_delegation_keys(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, **kwargs: Any
-    ) -> None:
+    async def revoke_user_delegation_keys(self, resource_group_name: str, account_name: str, **kwargs: Any) -> None:
         """Revoke user delegation keys.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -1858,7 +1886,7 @@ async def revoke_user_delegation_keys(  # pylint: disable=inconsistent-return-st
         :rtype: None
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1880,7 +1908,6 @@ async def revoke_user_delegation_keys(  # pylint: disable=inconsistent-return-st
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/operations/_table_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/operations/_table_operations.py
index dfdca9390935..fb9a5a578b8a 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/operations/_table_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/operations/_table_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
@@ -20,15 +19,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._table_operations import (
     build_create_request,
     build_delete_request,
@@ -40,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]]
 
@@ -86,7 +83,7 @@ async def create(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.Table
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -109,7 +106,6 @@ async def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -123,7 +119,7 @@ async def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("Table", pipeline_response)
+        deserialized = self._deserialize("Table", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -151,7 +147,7 @@ async def update(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.Table
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -174,7 +170,6 @@ async def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -188,7 +183,7 @@ async def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("Table", pipeline_response)
+        deserialized = self._deserialize("Table", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -214,7 +209,7 @@ async def get(self, resource_group_name: str, account_name: str, table_name: str
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.Table
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -237,7 +232,6 @@ async def get(self, resource_group_name: str, account_name: str, table_name: str
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -251,7 +245,7 @@ async def get(self, resource_group_name: str, account_name: str, table_name: str
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("Table", pipeline_response)
+        deserialized = self._deserialize("Table", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -259,9 +253,7 @@ async def get(self, resource_group_name: str, account_name: str, table_name: str
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, table_name: str, **kwargs: Any
-    ) -> None:
+    async def delete(self, resource_group_name: str, account_name: str, table_name: str, **kwargs: Any) -> None:
         """Deletes the table with the specified table name, under the specified account if it exists.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -279,7 +271,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,
@@ -302,7 +294,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -340,7 +331,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> As
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-08-01"))
         cls: ClsType[_models.ListTableResource] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -359,7 +350,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -375,7 +365,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/operations/_table_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/operations/_table_services_operations.py
index a5283a549439..0f0aec3768b6 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/operations/_table_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/operations/_table_services_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, Literal, Optional, Type, TypeVar, Union, overload
+from typing import Any, Callable, Dict, IO, Literal, Optional, TypeVar, Union, overload
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -19,14 +18,12 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._table_services_operations import (
     build_get_service_properties_request,
     build_list_request,
@@ -36,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]]
 
@@ -76,7 +73,7 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.ListTableServices
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -98,7 +95,6 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -112,7 +108,7 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListTableServices", pipeline_response)
+        deserialized = self._deserialize("ListTableServices", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -207,7 +203,7 @@ async def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.TableServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -243,7 +239,6 @@ async def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -257,7 +252,7 @@ async def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("TableServiceProperties", pipeline_response)
+        deserialized = self._deserialize("TableServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -282,7 +277,7 @@ async def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.TableServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -306,7 +301,6 @@ async def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -320,7 +314,7 @@ async def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("TableServiceProperties", pipeline_response)
+        deserialized = self._deserialize("TableServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/operations/_usages_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/operations/_usages_operations.py
index 4b492a5cde16..1167e1364a8e 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/operations/_usages_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/aio/operations/_usages_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
@@ -20,20 +19,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._usages_operations import build_list_by_location_request
 
 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 +72,7 @@ def list_by_location(self, location: str, **kwargs: Any) -> AsyncIterable["_mode
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-08-01"))
         cls: ClsType[_models.UsageListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -93,7 +90,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -109,7 +105,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/models/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/models/__init__.py
index a74858b74e08..d9b586893099 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/models/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/models/__init__.py
@@ -5,217 +5,228 @@
 # 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 AccessPolicy
-from ._models_py3 import AccountImmutabilityPolicyProperties
-from ._models_py3 import AccountSasParameters
-from ._models_py3 import ActiveDirectoryProperties
-from ._models_py3 import AzureEntityResource
-from ._models_py3 import AzureFilesIdentityBasedAuthentication
-from ._models_py3 import BlobContainer
-from ._models_py3 import BlobInventoryPolicy
-from ._models_py3 import BlobInventoryPolicyDefinition
-from ._models_py3 import BlobInventoryPolicyFilter
-from ._models_py3 import BlobInventoryPolicyRule
-from ._models_py3 import BlobInventoryPolicySchema
-from ._models_py3 import BlobRestoreParameters
-from ._models_py3 import BlobRestoreRange
-from ._models_py3 import BlobRestoreStatus
-from ._models_py3 import BlobServiceItems
-from ._models_py3 import BlobServiceProperties
-from ._models_py3 import ChangeFeed
-from ._models_py3 import CheckNameAvailabilityResult
-from ._models_py3 import CloudErrorBody
-from ._models_py3 import CorsRule
-from ._models_py3 import CorsRules
-from ._models_py3 import CustomDomain
-from ._models_py3 import DateAfterCreation
-from ._models_py3 import DateAfterModification
-from ._models_py3 import DeleteRetentionPolicy
-from ._models_py3 import DeletedAccount
-from ._models_py3 import DeletedAccountListResult
-from ._models_py3 import DeletedShare
-from ._models_py3 import Dimension
-from ._models_py3 import Encryption
-from ._models_py3 import EncryptionIdentity
-from ._models_py3 import EncryptionScope
-from ._models_py3 import EncryptionScopeKeyVaultProperties
-from ._models_py3 import EncryptionScopeListResult
-from ._models_py3 import EncryptionService
-from ._models_py3 import EncryptionServices
-from ._models_py3 import Endpoints
-from ._models_py3 import ErrorResponse
-from ._models_py3 import ErrorResponseBody
-from ._models_py3 import ExtendedLocation
-from ._models_py3 import FileServiceItems
-from ._models_py3 import FileServiceProperties
-from ._models_py3 import FileShare
-from ._models_py3 import FileShareItem
-from ._models_py3 import FileShareItems
-from ._models_py3 import GeoReplicationStats
-from ._models_py3 import IPRule
-from ._models_py3 import Identity
-from ._models_py3 import ImmutabilityPolicy
-from ._models_py3 import ImmutabilityPolicyProperties
-from ._models_py3 import ImmutableStorageAccount
-from ._models_py3 import ImmutableStorageWithVersioning
-from ._models_py3 import KeyCreationTime
-from ._models_py3 import KeyPolicy
-from ._models_py3 import KeyVaultProperties
-from ._models_py3 import LastAccessTimeTrackingPolicy
-from ._models_py3 import LeaseContainerRequest
-from ._models_py3 import LeaseContainerResponse
-from ._models_py3 import LeaseShareRequest
-from ._models_py3 import LeaseShareResponse
-from ._models_py3 import LegalHold
-from ._models_py3 import LegalHoldProperties
-from ._models_py3 import ListAccountSasResponse
-from ._models_py3 import ListBlobInventoryPolicy
-from ._models_py3 import ListContainerItem
-from ._models_py3 import ListContainerItems
-from ._models_py3 import ListQueue
-from ._models_py3 import ListQueueResource
-from ._models_py3 import ListQueueServices
-from ._models_py3 import ListServiceSasResponse
-from ._models_py3 import ListTableResource
-from ._models_py3 import ListTableServices
-from ._models_py3 import LocalUser
-from ._models_py3 import LocalUserKeys
-from ._models_py3 import LocalUserRegeneratePasswordResult
-from ._models_py3 import LocalUsers
-from ._models_py3 import ManagementPolicy
-from ._models_py3 import ManagementPolicyAction
-from ._models_py3 import ManagementPolicyBaseBlob
-from ._models_py3 import ManagementPolicyDefinition
-from ._models_py3 import ManagementPolicyFilter
-from ._models_py3 import ManagementPolicyRule
-from ._models_py3 import ManagementPolicySchema
-from ._models_py3 import ManagementPolicySnapShot
-from ._models_py3 import ManagementPolicyVersion
-from ._models_py3 import MetricSpecification
-from ._models_py3 import Multichannel
-from ._models_py3 import NetworkRuleSet
-from ._models_py3 import ObjectReplicationPolicies
-from ._models_py3 import ObjectReplicationPolicy
-from ._models_py3 import ObjectReplicationPolicyFilter
-from ._models_py3 import ObjectReplicationPolicyRule
-from ._models_py3 import Operation
-from ._models_py3 import OperationDisplay
-from ._models_py3 import OperationListResult
-from ._models_py3 import PermissionScope
-from ._models_py3 import PrivateEndpoint
-from ._models_py3 import PrivateEndpointConnection
-from ._models_py3 import PrivateEndpointConnectionListResult
-from ._models_py3 import PrivateLinkResource
-from ._models_py3 import PrivateLinkResourceListResult
-from ._models_py3 import PrivateLinkServiceConnectionState
-from ._models_py3 import ProtectedAppendWritesHistory
-from ._models_py3 import ProtocolSettings
-from ._models_py3 import ProxyResource
-from ._models_py3 import QueueServiceProperties
-from ._models_py3 import Resource
-from ._models_py3 import ResourceAccessRule
-from ._models_py3 import RestorePolicyProperties
-from ._models_py3 import Restriction
-from ._models_py3 import RoutingPreference
-from ._models_py3 import SKUCapability
-from ._models_py3 import SasPolicy
-from ._models_py3 import ServiceSasParameters
-from ._models_py3 import ServiceSpecification
-from ._models_py3 import SignedIdentifier
-from ._models_py3 import Sku
-from ._models_py3 import SkuInformation
-from ._models_py3 import SmbSetting
-from ._models_py3 import SshPublicKey
-from ._models_py3 import StorageAccount
-from ._models_py3 import StorageAccountCheckNameAvailabilityParameters
-from ._models_py3 import StorageAccountCreateParameters
-from ._models_py3 import StorageAccountInternetEndpoints
-from ._models_py3 import StorageAccountKey
-from ._models_py3 import StorageAccountListKeysResult
-from ._models_py3 import StorageAccountListResult
-from ._models_py3 import StorageAccountMicrosoftEndpoints
-from ._models_py3 import StorageAccountRegenerateKeyParameters
-from ._models_py3 import StorageAccountUpdateParameters
-from ._models_py3 import StorageQueue
-from ._models_py3 import StorageSkuListResult
-from ._models_py3 import SystemData
-from ._models_py3 import Table
-from ._models_py3 import TableServiceProperties
-from ._models_py3 import TagFilter
-from ._models_py3 import TagProperty
-from ._models_py3 import TrackedResource
-from ._models_py3 import UpdateHistoryProperty
-from ._models_py3 import Usage
-from ._models_py3 import UsageListResult
-from ._models_py3 import UsageName
-from ._models_py3 import UserAssignedIdentity
-from ._models_py3 import VirtualNetworkRule
+from typing import TYPE_CHECKING
 
-from ._storage_management_client_enums import AccessTier
-from ._storage_management_client_enums import AccountImmutabilityPolicyState
-from ._storage_management_client_enums import AccountStatus
-from ._storage_management_client_enums import ActiveDirectoryPropertiesAccountType
-from ._storage_management_client_enums import AllowedCopyScope
-from ._storage_management_client_enums import BlobInventoryPolicyName
-from ._storage_management_client_enums import BlobRestoreProgressStatus
-from ._storage_management_client_enums import Bypass
-from ._storage_management_client_enums import CorsRuleAllowedMethodsItem
-from ._storage_management_client_enums import CreatedByType
-from ._storage_management_client_enums import DefaultAction
-from ._storage_management_client_enums import DefaultSharePermission
-from ._storage_management_client_enums import DirectoryServiceOptions
-from ._storage_management_client_enums import EnabledProtocols
-from ._storage_management_client_enums import EncryptionScopeSource
-from ._storage_management_client_enums import EncryptionScopeState
-from ._storage_management_client_enums import ExpirationAction
-from ._storage_management_client_enums import ExtendedLocationTypes
-from ._storage_management_client_enums import Format
-from ._storage_management_client_enums import GeoReplicationStatus
-from ._storage_management_client_enums import HttpProtocol
-from ._storage_management_client_enums import IdentityType
-from ._storage_management_client_enums import ImmutabilityPolicyState
-from ._storage_management_client_enums import ImmutabilityPolicyUpdateType
-from ._storage_management_client_enums import InventoryRuleType
-from ._storage_management_client_enums import KeyPermission
-from ._storage_management_client_enums import KeySource
-from ._storage_management_client_enums import KeyType
-from ._storage_management_client_enums import Kind
-from ._storage_management_client_enums import LargeFileSharesState
-from ._storage_management_client_enums import LeaseContainerRequestAction
-from ._storage_management_client_enums import LeaseDuration
-from ._storage_management_client_enums import LeaseShareAction
-from ._storage_management_client_enums import LeaseState
-from ._storage_management_client_enums import LeaseStatus
-from ._storage_management_client_enums import ListContainersInclude
-from ._storage_management_client_enums import ManagementPolicyName
-from ._storage_management_client_enums import MigrationState
-from ._storage_management_client_enums import MinimumTlsVersion
-from ._storage_management_client_enums import Name
-from ._storage_management_client_enums import ObjectType
-from ._storage_management_client_enums import Permissions
-from ._storage_management_client_enums import PrivateEndpointConnectionProvisioningState
-from ._storage_management_client_enums import PrivateEndpointServiceConnectionStatus
-from ._storage_management_client_enums import ProvisioningState
-from ._storage_management_client_enums import PublicAccess
-from ._storage_management_client_enums import PublicNetworkAccess
-from ._storage_management_client_enums import Reason
-from ._storage_management_client_enums import ReasonCode
-from ._storage_management_client_enums import RootSquashType
-from ._storage_management_client_enums import RoutingChoice
-from ._storage_management_client_enums import RuleType
-from ._storage_management_client_enums import Schedule
-from ._storage_management_client_enums import Services
-from ._storage_management_client_enums import ShareAccessTier
-from ._storage_management_client_enums import SignedResource
-from ._storage_management_client_enums import SignedResourceTypes
-from ._storage_management_client_enums import SkuName
-from ._storage_management_client_enums import SkuTier
-from ._storage_management_client_enums import State
-from ._storage_management_client_enums import StorageAccountExpand
-from ._storage_management_client_enums import UsageUnit
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+
+from ._models_py3 import (  # type: ignore
+    AccessPolicy,
+    AccountImmutabilityPolicyProperties,
+    AccountSasParameters,
+    ActiveDirectoryProperties,
+    AzureEntityResource,
+    AzureFilesIdentityBasedAuthentication,
+    BlobContainer,
+    BlobInventoryPolicy,
+    BlobInventoryPolicyDefinition,
+    BlobInventoryPolicyFilter,
+    BlobInventoryPolicyRule,
+    BlobInventoryPolicySchema,
+    BlobRestoreParameters,
+    BlobRestoreRange,
+    BlobRestoreStatus,
+    BlobServiceItems,
+    BlobServiceProperties,
+    ChangeFeed,
+    CheckNameAvailabilityResult,
+    CloudErrorBody,
+    CorsRule,
+    CorsRules,
+    CustomDomain,
+    DateAfterCreation,
+    DateAfterModification,
+    DeleteRetentionPolicy,
+    DeletedAccount,
+    DeletedAccountListResult,
+    DeletedShare,
+    Dimension,
+    Encryption,
+    EncryptionIdentity,
+    EncryptionScope,
+    EncryptionScopeKeyVaultProperties,
+    EncryptionScopeListResult,
+    EncryptionService,
+    EncryptionServices,
+    Endpoints,
+    ErrorResponse,
+    ErrorResponseBody,
+    ExtendedLocation,
+    FileServiceItems,
+    FileServiceProperties,
+    FileShare,
+    FileShareItem,
+    FileShareItems,
+    GeoReplicationStats,
+    IPRule,
+    Identity,
+    ImmutabilityPolicy,
+    ImmutabilityPolicyProperties,
+    ImmutableStorageAccount,
+    ImmutableStorageWithVersioning,
+    KeyCreationTime,
+    KeyPolicy,
+    KeyVaultProperties,
+    LastAccessTimeTrackingPolicy,
+    LeaseContainerRequest,
+    LeaseContainerResponse,
+    LeaseShareRequest,
+    LeaseShareResponse,
+    LegalHold,
+    LegalHoldProperties,
+    ListAccountSasResponse,
+    ListBlobInventoryPolicy,
+    ListContainerItem,
+    ListContainerItems,
+    ListQueue,
+    ListQueueResource,
+    ListQueueServices,
+    ListServiceSasResponse,
+    ListTableResource,
+    ListTableServices,
+    LocalUser,
+    LocalUserKeys,
+    LocalUserRegeneratePasswordResult,
+    LocalUsers,
+    ManagementPolicy,
+    ManagementPolicyAction,
+    ManagementPolicyBaseBlob,
+    ManagementPolicyDefinition,
+    ManagementPolicyFilter,
+    ManagementPolicyRule,
+    ManagementPolicySchema,
+    ManagementPolicySnapShot,
+    ManagementPolicyVersion,
+    MetricSpecification,
+    Multichannel,
+    NetworkRuleSet,
+    ObjectReplicationPolicies,
+    ObjectReplicationPolicy,
+    ObjectReplicationPolicyFilter,
+    ObjectReplicationPolicyRule,
+    Operation,
+    OperationDisplay,
+    OperationListResult,
+    PermissionScope,
+    PrivateEndpoint,
+    PrivateEndpointConnection,
+    PrivateEndpointConnectionListResult,
+    PrivateLinkResource,
+    PrivateLinkResourceListResult,
+    PrivateLinkServiceConnectionState,
+    ProtectedAppendWritesHistory,
+    ProtocolSettings,
+    ProxyResource,
+    QueueServiceProperties,
+    Resource,
+    ResourceAccessRule,
+    RestorePolicyProperties,
+    Restriction,
+    RoutingPreference,
+    SKUCapability,
+    SasPolicy,
+    ServiceSasParameters,
+    ServiceSpecification,
+    SignedIdentifier,
+    Sku,
+    SkuInformation,
+    SmbSetting,
+    SshPublicKey,
+    StorageAccount,
+    StorageAccountCheckNameAvailabilityParameters,
+    StorageAccountCreateParameters,
+    StorageAccountInternetEndpoints,
+    StorageAccountKey,
+    StorageAccountListKeysResult,
+    StorageAccountListResult,
+    StorageAccountMicrosoftEndpoints,
+    StorageAccountRegenerateKeyParameters,
+    StorageAccountUpdateParameters,
+    StorageQueue,
+    StorageSkuListResult,
+    SystemData,
+    Table,
+    TableServiceProperties,
+    TagFilter,
+    TagProperty,
+    TrackedResource,
+    UpdateHistoryProperty,
+    Usage,
+    UsageListResult,
+    UsageName,
+    UserAssignedIdentity,
+    VirtualNetworkRule,
+)
+
+from ._storage_management_client_enums import (  # type: ignore
+    AccessTier,
+    AccountImmutabilityPolicyState,
+    AccountStatus,
+    ActiveDirectoryPropertiesAccountType,
+    AllowedCopyScope,
+    BlobInventoryPolicyName,
+    BlobRestoreProgressStatus,
+    Bypass,
+    CorsRuleAllowedMethodsItem,
+    CreatedByType,
+    DefaultAction,
+    DefaultSharePermission,
+    DirectoryServiceOptions,
+    EnabledProtocols,
+    EncryptionScopeSource,
+    EncryptionScopeState,
+    ExpirationAction,
+    ExtendedLocationTypes,
+    Format,
+    GeoReplicationStatus,
+    HttpProtocol,
+    IdentityType,
+    ImmutabilityPolicyState,
+    ImmutabilityPolicyUpdateType,
+    InventoryRuleType,
+    KeyPermission,
+    KeySource,
+    KeyType,
+    Kind,
+    LargeFileSharesState,
+    LeaseContainerRequestAction,
+    LeaseDuration,
+    LeaseShareAction,
+    LeaseState,
+    LeaseStatus,
+    ListContainersInclude,
+    ManagementPolicyName,
+    MigrationState,
+    MinimumTlsVersion,
+    Name,
+    ObjectType,
+    Permissions,
+    PrivateEndpointConnectionProvisioningState,
+    PrivateEndpointServiceConnectionStatus,
+    ProvisioningState,
+    PublicAccess,
+    PublicNetworkAccess,
+    Reason,
+    ReasonCode,
+    RootSquashType,
+    RoutingChoice,
+    RuleType,
+    Schedule,
+    Services,
+    ShareAccessTier,
+    SignedResource,
+    SignedResourceTypes,
+    SkuName,
+    SkuTier,
+    State,
+    StorageAccountExpand,
+    UsageUnit,
+)
 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__ = [
@@ -427,5 +438,5 @@
     "StorageAccountExpand",
     "UsageUnit",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/models/_models_py3.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/models/_models_py3.py
index 49ab5097390b..9da753a07b02 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/models/_models_py3.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/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
 
 
@@ -444,7 +443,7 @@ def __init__(
         self.default_share_permission = default_share_permission
 
 
-class BlobContainer(AzureEntityResource):  # pylint: disable=too-many-instance-attributes
+class BlobContainer(AzureEntityResource):
     """Properties of the blob container, including Id, resource name, resource type, Etag.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -1057,7 +1056,7 @@ def __init__(self, **kwargs: Any) -> None:
         self.value = None
 
 
-class BlobServiceProperties(Resource):  # pylint: disable=too-many-instance-attributes
+class BlobServiceProperties(Resource):
     """The properties of a storage account’s Blob service.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -2316,7 +2315,7 @@ def __init__(
         self.protocol_settings = protocol_settings
 
 
-class FileShare(AzureEntityResource):  # pylint: disable=too-many-instance-attributes
+class FileShare(AzureEntityResource):
     """Properties of the file share, including Id, resource name, resource type, Etag.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -2474,7 +2473,7 @@ def __init__(
         self.snapshot_time = None
 
 
-class FileShareItem(AzureEntityResource):  # pylint: disable=too-many-instance-attributes
+class FileShareItem(AzureEntityResource):
     """The file share properties be listed out.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -3229,7 +3228,7 @@ class LeaseContainerRequest(_serialization.Model):
     All required parameters must be populated in order to send to server.
 
     :ivar action: Specifies the lease action. Can be one of the available actions. Required. Known
-     values are: "Acquire", "Renew", "Change", "Release", and "Break".
+     values are: "Acquire", "Renew", "Change", "Release", "Break", and "Break".
     :vartype action: str or ~azure.mgmt.storage.v2021_08_01.models.LeaseContainerRequestAction
     :ivar lease_id: Identifies the lease. Can be specified in any valid GUID string format.
     :vartype lease_id: str
@@ -3268,7 +3267,7 @@ def __init__(
     ) -> None:
         """
         :keyword action: Specifies the lease action. Can be one of the available actions. Required.
-         Known values are: "Acquire", "Renew", "Change", "Release", and "Break".
+         Known values are: "Acquire", "Renew", "Change", "Release", "Break", and "Break".
         :paramtype action: str or ~azure.mgmt.storage.v2021_08_01.models.LeaseContainerRequestAction
         :keyword lease_id: Identifies the lease. Can be specified in any valid GUID string format.
         :paramtype lease_id: str
@@ -3326,7 +3325,7 @@ class LeaseShareRequest(_serialization.Model):
     All required parameters must be populated in order to send to server.
 
     :ivar action: Specifies the lease action. Can be one of the available actions. Required. Known
-     values are: "Acquire", "Renew", "Change", "Release", and "Break".
+     values are: "Acquire", "Renew", "Change", "Release", "Break", and "Break".
     :vartype action: str or ~azure.mgmt.storage.v2021_08_01.models.LeaseShareAction
     :ivar lease_id: Identifies the lease. Can be specified in any valid GUID string format.
     :vartype lease_id: str
@@ -3365,7 +3364,7 @@ def __init__(
     ) -> None:
         """
         :keyword action: Specifies the lease action. Can be one of the available actions. Required.
-         Known values are: "Acquire", "Renew", "Change", "Release", and "Break".
+         Known values are: "Acquire", "Renew", "Change", "Release", "Break", and "Break".
         :paramtype action: str or ~azure.mgmt.storage.v2021_08_01.models.LeaseShareAction
         :keyword lease_id: Identifies the lease. Can be specified in any valid GUID string format.
         :paramtype lease_id: str
@@ -3563,7 +3562,7 @@ def __init__(self, **kwargs: Any) -> None:
         self.value = None
 
 
-class ListContainerItem(AzureEntityResource):  # pylint: disable=too-many-instance-attributes
+class ListContainerItem(AzureEntityResource):
     """The blob container properties be listed out.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -3931,7 +3930,7 @@ def __init__(self, **kwargs: Any) -> None:
         self.value = None
 
 
-class LocalUser(Resource):  # pylint: disable=too-many-instance-attributes
+class LocalUser(Resource):
     """The local user associated with the storage accounts.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -5529,7 +5528,7 @@ def __init__(
         self.expiration_action = expiration_action
 
 
-class ServiceSasParameters(_serialization.Model):  # pylint: disable=too-many-instance-attributes
+class ServiceSasParameters(_serialization.Model):
     """The parameters to list service SAS credentials of a specific resource.
 
     All required parameters must be populated in order to send to server.
@@ -5963,7 +5962,7 @@ class SshPublicKey(_serialization.Model):
 
     :ivar description: Optional. It is used to store the function/usage of the key.
     :vartype description: str
-    :ivar key: Ssh public key base64 encoded. The format should be: ':code:`<keyType>`
+    :ivar key: Ssh public key base64 encoded. The format should be: '\\ :code:`<keyType>`
      :code:`<keyData>`', e.g. ssh-rsa AAAABBBB.
     :vartype key: str
     """
@@ -5977,7 +5976,7 @@ def __init__(self, *, description: Optional[str] = None, key: Optional[str] = No
         """
         :keyword description: Optional. It is used to store the function/usage of the key.
         :paramtype description: str
-        :keyword key: Ssh public key base64 encoded. The format should be: ':code:`<keyType>`
+        :keyword key: Ssh public key base64 encoded. The format should be: '\\ :code:`<keyType>`
          :code:`<keyData>`', e.g. ssh-rsa AAAABBBB.
         :paramtype key: str
         """
@@ -6035,7 +6034,7 @@ def __init__(self, *, location: str, tags: Optional[Dict[str, str]] = None, **kw
         self.location = location
 
 
-class StorageAccount(TrackedResource):  # pylint: disable=too-many-instance-attributes
+class StorageAccount(TrackedResource):
     """The storage account.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -6426,7 +6425,7 @@ def __init__(self, *, name: str, **kwargs: Any) -> None:
         self.name = name
 
 
-class StorageAccountCreateParameters(_serialization.Model):  # pylint: disable=too-many-instance-attributes
+class StorageAccountCreateParameters(_serialization.Model):
     """The parameters used when creating a storage account.
 
     All required parameters must be populated in order to send to server.
@@ -6930,7 +6929,7 @@ def __init__(self, *, key_name: str, **kwargs: Any) -> None:
         self.key_name = key_name
 
 
-class StorageAccountUpdateParameters(_serialization.Model):  # pylint: disable=too-many-instance-attributes
+class StorageAccountUpdateParameters(_serialization.Model):
     """The parameters that can be provided when updating the storage account properties.
 
     :ivar sku: Gets or sets the SKU name. Note that the SKU name cannot be updated to Standard_ZRS,
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/models/_storage_management_client_enums.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/models/_storage_management_client_enums.py
index cc58b31a097a..fc793d2bab73 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/models/_storage_management_client_enums.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/models/_storage_management_client_enums.py
@@ -276,6 +276,7 @@ class LeaseContainerRequestAction(str, Enum, metaclass=CaseInsensitiveEnumMeta):
     RENEW = "Renew"
     CHANGE = "Change"
     RELEASE = "Release"
+    BREAK = "Break"
     BREAK_ENUM = "Break"
 
 
@@ -295,6 +296,7 @@ class LeaseShareAction(str, Enum, metaclass=CaseInsensitiveEnumMeta):
     RENEW = "Renew"
     CHANGE = "Change"
     RELEASE = "Release"
+    BREAK = "Break"
     BREAK_ENUM = "Break"
 
 
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/operations/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/operations/__init__.py
index bbce85749d18..a0549517e087 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/operations/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/operations/__init__.py
@@ -5,30 +5,36 @@
 # 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 ._skus_operations import SkusOperations
-from ._storage_accounts_operations import StorageAccountsOperations
-from ._deleted_accounts_operations import DeletedAccountsOperations
-from ._usages_operations import UsagesOperations
-from ._management_policies_operations import ManagementPoliciesOperations
-from ._blob_inventory_policies_operations import BlobInventoryPoliciesOperations
-from ._private_endpoint_connections_operations import PrivateEndpointConnectionsOperations
-from ._private_link_resources_operations import PrivateLinkResourcesOperations
-from ._object_replication_policies_operations import ObjectReplicationPoliciesOperations
-from ._local_users_operations import LocalUsersOperations
-from ._encryption_scopes_operations import EncryptionScopesOperations
-from ._blob_services_operations import BlobServicesOperations
-from ._blob_containers_operations import BlobContainersOperations
-from ._file_services_operations import FileServicesOperations
-from ._file_shares_operations import FileSharesOperations
-from ._queue_services_operations import QueueServicesOperations
-from ._queue_operations import QueueOperations
-from ._table_services_operations import TableServicesOperations
-from ._table_operations import TableOperations
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._operations import Operations  # type: ignore
+from ._skus_operations import SkusOperations  # type: ignore
+from ._storage_accounts_operations import StorageAccountsOperations  # type: ignore
+from ._deleted_accounts_operations import DeletedAccountsOperations  # type: ignore
+from ._usages_operations import UsagesOperations  # type: ignore
+from ._management_policies_operations import ManagementPoliciesOperations  # type: ignore
+from ._blob_inventory_policies_operations import BlobInventoryPoliciesOperations  # type: ignore
+from ._private_endpoint_connections_operations import PrivateEndpointConnectionsOperations  # type: ignore
+from ._private_link_resources_operations import PrivateLinkResourcesOperations  # type: ignore
+from ._object_replication_policies_operations import ObjectReplicationPoliciesOperations  # type: ignore
+from ._local_users_operations import LocalUsersOperations  # type: ignore
+from ._encryption_scopes_operations import EncryptionScopesOperations  # type: ignore
+from ._blob_services_operations import BlobServicesOperations  # type: ignore
+from ._blob_containers_operations import BlobContainersOperations  # type: ignore
+from ._file_services_operations import FileServicesOperations  # type: ignore
+from ._file_shares_operations import FileSharesOperations  # type: ignore
+from ._queue_services_operations import QueueServicesOperations  # type: ignore
+from ._queue_operations import QueueOperations  # type: ignore
+from ._table_services_operations import TableServicesOperations  # type: ignore
+from ._table_operations import TableOperations  # 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__ = [
@@ -53,5 +59,5 @@
     "TableServicesOperations",
     "TableOperations",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/operations/_blob_containers_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/operations/_blob_containers_operations.py
index 2f35170db5f6..feddb31f3148 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/operations/_blob_containers_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/operations/_blob_containers_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,7 @@
 # --------------------------------------------------------------------------
 from io import IOBase
 import sys
-from typing import Any, Callable, Dict, IO, Iterable, Literal, Optional, Type, TypeVar, Union, cast, overload
+from typing import Any, Callable, Dict, IO, Iterable, Iterator, Literal, Optional, TypeVar, Union, cast, overload
 import urllib.parse
 
 from azure.core.exceptions import (
@@ -17,13 +17,14 @@
     ResourceExistsError,
     ResourceNotFoundError,
     ResourceNotModifiedError,
+    StreamClosedError,
+    StreamConsumedError,
     map_error,
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
 from azure.core.polling import LROPoller, NoPolling, PollingMethod
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
@@ -31,12 +32,11 @@
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -649,7 +649,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-08-01"))
         cls: ClsType[_models.ListContainerItems] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -671,7 +671,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -687,7 +686,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -822,7 +820,7 @@ def create(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -857,7 +855,6 @@ def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -871,11 +868,7 @@ def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("BlobContainer", pipeline_response)
-
-        if response.status_code == 201:
-            deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -985,7 +978,7 @@ def update(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1020,7 +1013,6 @@ def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1034,7 +1026,7 @@ def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1063,7 +1055,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1086,7 +1078,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1100,7 +1091,7 @@ def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1129,7 +1120,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,
@@ -1152,7 +1143,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1275,7 +1265,7 @@ def set_legal_hold(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.LegalHold
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1310,7 +1300,6 @@ def set_legal_hold(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1324,7 +1313,7 @@ def set_legal_hold(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LegalHold", pipeline_response)
+        deserialized = self._deserialize("LegalHold", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1434,7 +1423,7 @@ def clear_legal_hold(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.LegalHold
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1469,7 +1458,6 @@ def clear_legal_hold(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1483,7 +1471,7 @@ def clear_legal_hold(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LegalHold", pipeline_response)
+        deserialized = self._deserialize("LegalHold", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1610,7 +1598,7 @@ def create_or_update_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1651,7 +1639,6 @@ def create_or_update_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1668,7 +1655,7 @@ def create_or_update_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1707,7 +1694,7 @@ def get_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1733,7 +1720,6 @@ def get_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1750,7 +1736,7 @@ def get_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1786,7 +1772,7 @@ def delete_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1812,7 +1798,6 @@ def delete_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1829,7 +1814,7 @@ def delete_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1863,7 +1848,7 @@ def lock_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1887,7 +1872,6 @@ def lock_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1904,7 +1888,7 @@ def lock_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -2034,7 +2018,7 @@ def extend_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -2073,7 +2057,6 @@ def extend_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -2090,7 +2073,7 @@ def extend_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -2200,7 +2183,7 @@ def lease(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.LeaseContainerResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -2238,7 +2221,6 @@ def lease(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -2252,17 +2234,17 @@ def lease(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LeaseContainerResponse", pipeline_response)
+        deserialized = self._deserialize("LeaseContainerResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
 
         return deserialized  # type: ignore
 
-    def _object_level_worm_initial(  # pylint: disable=inconsistent-return-statements
+    def _object_level_worm_initial(
         self, resource_group_name: str, account_name: str, container_name: str, **kwargs: Any
-    ) -> None:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> Iterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -2274,7 +2256,7 @@ def _object_level_worm_initial(  # pylint: disable=inconsistent-return-statement
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-08-01"))
-        cls: ClsType[None] = kwargs.pop("cls", None)
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
 
         _request = build_object_level_worm_request(
             resource_group_name=resource_group_name,
@@ -2285,10 +2267,10 @@ def _object_level_worm_initial(  # pylint: disable=inconsistent-return-statement
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -2296,11 +2278,19 @@ def _object_level_worm_initial(  # pylint: disable=inconsistent-return-statement
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
-            return cls(pipeline_response, None, {})  # type: ignore
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
 
     @distributed_trace
     def begin_object_level_worm(
@@ -2336,7 +2326,7 @@ def begin_object_level_worm(
         lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
         cont_token: Optional[str] = kwargs.pop("continuation_token", None)
         if cont_token is None:
-            raw_result = self._object_level_worm_initial(  # type: ignore
+            raw_result = self._object_level_worm_initial(
                 resource_group_name=resource_group_name,
                 account_name=account_name,
                 container_name=container_name,
@@ -2346,6 +2336,7 @@ def begin_object_level_worm(
                 params=_params,
                 **kwargs
             )
+            raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/operations/_blob_inventory_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/operations/_blob_inventory_policies_operations.py
index c4d305106d8d..64b32ebd7304 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/operations/_blob_inventory_policies_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/operations/_blob_inventory_policies_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 (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -235,7 +232,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.BlobInventoryPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -258,7 +255,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -273,7 +269,7 @@ def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response)
+        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -377,7 +373,7 @@ def create_or_update(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.BlobInventoryPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -412,7 +408,6 @@ def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -427,7 +422,7 @@ def create_or_update(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response)
+        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -459,7 +454,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,
@@ -482,7 +477,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -524,7 +518,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-08-01"))
         cls: ClsType[_models.ListBlobInventoryPolicy] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -543,7 +537,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -559,7 +552,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/operations/_blob_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/operations/_blob_services_operations.py
index d6388ba48216..8626211ac667 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/operations/_blob_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/operations/_blob_services_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, Literal, Optional, Type, TypeVar, Union, overload
+from typing import Any, Callable, Dict, IO, Iterable, Literal, Optional, TypeVar, Union, overload
 import urllib.parse
 
 from azure.core.exceptions import (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -191,7 +188,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-08-01"))
         cls: ClsType[_models.BlobServiceItems] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -210,7 +207,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -226,7 +222,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -343,7 +338,7 @@ def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.BlobServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -379,7 +374,6 @@ def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -393,7 +387,7 @@ def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobServiceProperties", pipeline_response)
+        deserialized = self._deserialize("BlobServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -418,7 +412,7 @@ def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.BlobServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -442,7 +436,6 @@ def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -456,7 +449,7 @@ def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobServiceProperties", pipeline_response)
+        deserialized = self._deserialize("BlobServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/operations/_deleted_accounts_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/operations/_deleted_accounts_operations.py
index a76147a14102..727f3a9d876a 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/operations/_deleted_accounts_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/operations/_deleted_accounts_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 (
@@ -20,20 +19,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -130,7 +127,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.DeletedAccount"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-08-01"))
         cls: ClsType[_models.DeletedAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -147,7 +144,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -163,7 +159,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -205,7 +200,7 @@ def get(self, deleted_account_name: str, location: str, **kwargs: Any) -> _model
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.DeletedAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -227,7 +222,6 @@ def get(self, deleted_account_name: str, location: str, **kwargs: Any) -> _model
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -242,7 +236,7 @@ def get(self, deleted_account_name: str, location: str, **kwargs: Any) -> _model
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("DeletedAccount", pipeline_response)
+        deserialized = self._deserialize("DeletedAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/operations/_encryption_scopes_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/operations/_encryption_scopes_operations.py
index d3f79089c249..12009d0780e4 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/operations/_encryption_scopes_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/operations/_encryption_scopes_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 (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -315,7 +312,7 @@ def put(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.EncryptionScope
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -350,7 +347,6 @@ def put(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -365,11 +361,7 @@ def put(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("EncryptionScope", pipeline_response)
-
-        if response.status_code == 201:
-            deserialized = self._deserialize("EncryptionScope", pipeline_response)
+        deserialized = self._deserialize("EncryptionScope", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -479,7 +471,7 @@ def patch(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.EncryptionScope
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -514,7 +506,6 @@ def patch(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -529,7 +520,7 @@ def patch(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("EncryptionScope", pipeline_response)
+        deserialized = self._deserialize("EncryptionScope", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -558,7 +549,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.EncryptionScope
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -581,7 +572,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -596,7 +586,7 @@ def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("EncryptionScope", pipeline_response)
+        deserialized = self._deserialize("EncryptionScope", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -624,7 +614,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> It
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-08-01"))
         cls: ClsType[_models.EncryptionScopeListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -643,7 +633,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -659,7 +648,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/operations/_file_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/operations/_file_services_operations.py
index 10444d0be5f5..8bdd889b150c 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/operations/_file_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/operations/_file_services_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, Literal, Optional, Type, TypeVar, Union, overload
+from typing import Any, Callable, Dict, IO, Literal, Optional, TypeVar, Union, overload
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -19,20 +18,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -179,7 +176,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.FileServiceItems
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -201,7 +198,6 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -215,7 +211,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileServiceItems", pipeline_response)
+        deserialized = self._deserialize("FileServiceItems", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -310,7 +306,7 @@ def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.FileServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -346,7 +342,6 @@ def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -360,7 +355,7 @@ def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileServiceProperties", pipeline_response)
+        deserialized = self._deserialize("FileServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -385,7 +380,7 @@ def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.FileServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -409,7 +404,6 @@ def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -423,7 +417,7 @@ def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileServiceProperties", pipeline_response)
+        deserialized = self._deserialize("FileServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/operations/_file_shares_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/operations/_file_shares_operations.py
index 0ff00855c7e8..45971ecc471c 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/operations/_file_shares_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/operations/_file_shares_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,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 (
@@ -21,20 +21,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -401,7 +399,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-08-01"))
         cls: ClsType[_models.FileShareItems] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -423,7 +421,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -439,7 +436,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -586,7 +582,7 @@ def create(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.FileShare
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -622,7 +618,6 @@ def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -636,11 +631,7 @@ def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("FileShare", pipeline_response)
-
-        if response.status_code == 201:
-            deserialized = self._deserialize("FileShare", pipeline_response)
+        deserialized = self._deserialize("FileShare", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -750,7 +741,7 @@ def update(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.FileShare
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -785,7 +776,6 @@ def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -799,7 +789,7 @@ def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileShare", pipeline_response)
+        deserialized = self._deserialize("FileShare", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -840,7 +830,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.FileShare
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -865,7 +855,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -879,7 +868,7 @@ def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileShare", pipeline_response)
+        deserialized = self._deserialize("FileShare", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -924,7 +913,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,
@@ -949,7 +938,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -967,7 +955,7 @@ def delete(  # pylint: disable=inconsistent-return-statements
             return cls(pipeline_response, None, {})  # type: ignore
 
     @overload
-    def restore(  # pylint: disable=inconsistent-return-statements
+    def restore(
         self,
         resource_group_name: str,
         account_name: str,
@@ -1002,7 +990,7 @@ def restore(  # pylint: disable=inconsistent-return-statements
         """
 
     @overload
-    def restore(  # pylint: disable=inconsistent-return-statements
+    def restore(
         self,
         resource_group_name: str,
         account_name: str,
@@ -1065,7 +1053,7 @@ def restore(  # 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,
@@ -1100,7 +1088,6 @@ def restore(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1232,7 +1219,7 @@ def lease(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.LeaseShareResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1271,7 +1258,6 @@ def lease(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1288,7 +1274,7 @@ def lease(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("LeaseShareResponse", pipeline_response)
+        deserialized = self._deserialize("LeaseShareResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/operations/_local_users_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/operations/_local_users_operations.py
index 68979da57553..889b61e432c0 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/operations/_local_users_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/operations/_local_users_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 (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -287,7 +284,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> It
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-08-01"))
         cls: ClsType[_models.LocalUsers] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -306,7 +303,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -322,7 +318,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -370,7 +365,7 @@ def get(self, resource_group_name: str, account_name: str, username: str, **kwar
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.LocalUser
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -393,7 +388,6 @@ def get(self, resource_group_name: str, account_name: str, username: str, **kwar
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -408,7 +402,7 @@ def get(self, resource_group_name: str, account_name: str, username: str, **kwar
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LocalUser", pipeline_response)
+        deserialized = self._deserialize("LocalUser", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -509,7 +503,7 @@ def create_or_update(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.LocalUser
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -544,7 +538,6 @@ def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -559,7 +552,7 @@ def create_or_update(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LocalUser", pipeline_response)
+        deserialized = self._deserialize("LocalUser", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -586,7 +579,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,
@@ -609,7 +602,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -647,7 +639,7 @@ def list_keys(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.LocalUserKeys
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -670,7 +662,6 @@ def list_keys(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -685,7 +676,7 @@ def list_keys(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LocalUserKeys", pipeline_response)
+        deserialized = self._deserialize("LocalUserKeys", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -712,7 +703,7 @@ def regenerate_password(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.LocalUserRegeneratePasswordResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -735,7 +726,6 @@ def regenerate_password(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -750,7 +740,7 @@ def regenerate_password(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LocalUserRegeneratePasswordResult", pipeline_response)
+        deserialized = self._deserialize("LocalUserRegeneratePasswordResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/operations/_management_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/operations/_management_policies_operations.py
index 57a0be97814b..247aed4d3473 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/operations/_management_policies_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/operations/_management_policies_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,
@@ -19,20 +18,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -196,7 +193,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.ManagementPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -219,7 +216,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -233,7 +229,7 @@ def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ManagementPolicy", pipeline_response)
+        deserialized = self._deserialize("ManagementPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -337,7 +333,7 @@ def create_or_update(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.ManagementPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -372,7 +368,6 @@ def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -386,7 +381,7 @@ def create_or_update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ManagementPolicy", pipeline_response)
+        deserialized = self._deserialize("ManagementPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -418,7 +413,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,
@@ -441,7 +436,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/operations/_object_replication_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/operations/_object_replication_policies_operations.py
index 06bf8cc91646..82014a9185e3 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/operations/_object_replication_policies_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/operations/_object_replication_policies_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 (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -229,7 +226,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-08-01"))
         cls: ClsType[_models.ObjectReplicationPolicies] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -248,7 +245,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -264,7 +260,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -316,7 +311,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.ObjectReplicationPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -339,7 +334,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -354,7 +348,7 @@ def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response)
+        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -464,7 +458,7 @@ def create_or_update(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.ObjectReplicationPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -499,7 +493,6 @@ def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -514,7 +507,7 @@ def create_or_update(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response)
+        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -543,7 +536,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,
@@ -566,7 +559,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/operations/_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/operations/_operations.py
index 9bc97e1b9478..e61f6ab48b5b 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/operations/_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/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 (
@@ -20,20 +19,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -94,7 +91,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.Operation"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-08-01"))
         cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -110,7 +107,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -126,7 +122,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/operations/_private_endpoint_connections_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/operations/_private_endpoint_connections_operations.py
index 9873447dbabb..692d5b29ce68 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/operations/_private_endpoint_connections_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/operations/_private_endpoint_connections_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 (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -241,7 +238,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-08-01"))
         cls: ClsType[_models.PrivateEndpointConnectionListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -260,7 +257,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -276,7 +272,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -325,7 +320,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.PrivateEndpointConnection
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -348,7 +343,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -363,7 +357,7 @@ def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response)
+        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -464,7 +458,7 @@ def put(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.PrivateEndpointConnection
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -499,7 +493,6 @@ def put(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -514,7 +507,7 @@ def put(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response)
+        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -541,7 +534,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,
@@ -564,7 +557,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/operations/_private_link_resources_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/operations/_private_link_resources_operations.py
index 8a0b95c2382e..ebe60e547699 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/operations/_private_link_resources_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/operations/_private_link_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, Optional, Type, TypeVar
+from typing import Any, Callable, Dict, Optional, TypeVar
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -18,20 +17,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -109,7 +106,7 @@ def list_by_storage_account(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.PrivateLinkResourceListResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -131,7 +128,6 @@ def list_by_storage_account(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -145,7 +141,7 @@ def list_by_storage_account(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("PrivateLinkResourceListResult", pipeline_response)
+        deserialized = self._deserialize("PrivateLinkResourceListResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/operations/_queue_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/operations/_queue_operations.py
index 8a247a770076..623ea68f948c 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/operations/_queue_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/operations/_queue_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 (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -375,7 +372,7 @@ def create(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.StorageQueue
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -410,7 +407,6 @@ def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -424,7 +420,7 @@ def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageQueue", pipeline_response)
+        deserialized = self._deserialize("StorageQueue", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -531,7 +527,7 @@ def update(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.StorageQueue
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -566,7 +562,6 @@ def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -580,7 +575,7 @@ def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageQueue", pipeline_response)
+        deserialized = self._deserialize("StorageQueue", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -607,7 +602,7 @@ def get(self, resource_group_name: str, account_name: str, queue_name: str, **kw
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.StorageQueue
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -630,7 +625,6 @@ def get(self, resource_group_name: str, account_name: str, queue_name: str, **kw
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -644,7 +638,7 @@ def get(self, resource_group_name: str, account_name: str, queue_name: str, **kw
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageQueue", pipeline_response)
+        deserialized = self._deserialize("StorageQueue", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -673,7 +667,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,
@@ -696,7 +690,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -747,7 +740,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-08-01"))
         cls: ClsType[_models.ListQueueResource] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -768,7 +761,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -784,7 +776,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/operations/_queue_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/operations/_queue_services_operations.py
index 547a52f4847c..06b360ec7d05 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/operations/_queue_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/operations/_queue_services_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, Literal, Optional, Type, TypeVar, Union, overload
+from typing import Any, Callable, Dict, IO, Literal, Optional, TypeVar, Union, overload
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -19,20 +18,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -179,7 +176,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.ListQueueServices
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -201,7 +198,6 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -215,7 +211,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListQueueServices", pipeline_response)
+        deserialized = self._deserialize("ListQueueServices", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -310,7 +306,7 @@ def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.QueueServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -346,7 +342,6 @@ def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -360,7 +355,7 @@ def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("QueueServiceProperties", pipeline_response)
+        deserialized = self._deserialize("QueueServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -385,7 +380,7 @@ def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.QueueServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -409,7 +404,6 @@ def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -423,7 +417,7 @@ def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("QueueServiceProperties", pipeline_response)
+        deserialized = self._deserialize("QueueServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/operations/_skus_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/operations/_skus_operations.py
index dadecc647a04..49bf0f2769e0 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/operations/_skus_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/operations/_skus_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 (
@@ -20,20 +19,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -99,7 +96,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.SkuInformation"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-08-01"))
         cls: ClsType[_models.StorageSkuListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -116,7 +113,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -132,7 +128,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/operations/_storage_accounts_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/operations/_storage_accounts_operations.py
index 3d2da0f70008..a7d6fc103a68 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/operations/_storage_accounts_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/operations/_storage_accounts_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,7 @@
 # --------------------------------------------------------------------------
 from io import IOBase
 import sys
-from typing import Any, Callable, Dict, IO, Iterable, Literal, Optional, Type, TypeVar, Union, cast, overload
+from typing import Any, Callable, Dict, IO, Iterable, Iterator, Literal, Optional, TypeVar, Union, cast, overload
 import urllib.parse
 
 from azure.core.exceptions import (
@@ -17,13 +17,14 @@
     ResourceExistsError,
     ResourceNotFoundError,
     ResourceNotModifiedError,
+    StreamClosedError,
+    StreamConsumedError,
     map_error,
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
 from azure.core.polling import LROPoller, NoPolling, PollingMethod
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
@@ -31,12 +32,11 @@
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -649,7 +649,7 @@ def check_name_availability(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.CheckNameAvailabilityResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -681,7 +681,6 @@ def check_name_availability(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -695,7 +694,7 @@ def check_name_availability(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response)
+        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -708,8 +707,8 @@ def _create_initial(
         account_name: str,
         parameters: Union[_models.StorageAccountCreateParameters, IO[bytes]],
         **kwargs: Any
-    ) -> Optional[_models.StorageAccount]:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> Iterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -722,7 +721,7 @@ def _create_initial(
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-08-01"))
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
-        cls: ClsType[Optional[_models.StorageAccount]] = kwargs.pop("cls", None)
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
         _json = None
@@ -743,10 +742,10 @@ def _create_initial(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -754,12 +753,14 @@ def _create_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = None
-        if response.status_code == 200:
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -882,10 +883,11 @@ def begin_create(
                 params=_params,
                 **kwargs
             )
+            raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+            deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
             if cls:
                 return cls(pipeline_response, deserialized, {})  # type: ignore
             return deserialized
@@ -924,7 +926,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,
@@ -946,7 +948,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -991,7 +992,7 @@ def get_properties(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1014,7 +1015,6 @@ def get_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1028,7 +1028,7 @@ def get_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1139,7 +1139,7 @@ def update(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1173,7 +1173,6 @@ def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1187,7 +1186,7 @@ def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1209,7 +1208,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.StorageAccount"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-08-01"))
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1226,7 +1225,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -1242,7 +1240,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -1289,7 +1286,7 @@ def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> Ite
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-08-01"))
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1307,7 +1304,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -1323,7 +1319,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -1373,7 +1368,7 @@ def list_keys(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.StorageAccountListKeysResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1396,7 +1391,6 @@ def list_keys(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1410,7 +1404,7 @@ def list_keys(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response)
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1504,7 +1498,7 @@ def regenerate_key(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.StorageAccountListKeysResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1538,7 +1532,6 @@ def regenerate_key(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1552,7 +1545,7 @@ def regenerate_key(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response)
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1643,7 +1636,7 @@ def list_account_sas(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.ListAccountSasResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1677,7 +1670,6 @@ def list_account_sas(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1691,7 +1683,7 @@ def list_account_sas(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListAccountSasResponse", pipeline_response)
+        deserialized = self._deserialize("ListAccountSasResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1780,7 +1772,7 @@ def list_service_sas(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.ListServiceSasResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1814,7 +1806,6 @@ def list_service_sas(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1828,17 +1819,15 @@ def list_service_sas(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListServiceSasResponse", pipeline_response)
+        deserialized = self._deserialize("ListServiceSasResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
 
         return deserialized  # type: ignore
 
-    def _failover_initial(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, **kwargs: Any
-    ) -> None:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    def _failover_initial(self, resource_group_name: str, account_name: str, **kwargs: Any) -> Iterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1850,7 +1839,7 @@ def _failover_initial(  # pylint: disable=inconsistent-return-statements
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-08-01"))
-        cls: ClsType[None] = kwargs.pop("cls", None)
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
 
         _request = build_failover_request(
             resource_group_name=resource_group_name,
@@ -1860,10 +1849,10 @@ def _failover_initial(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -1871,11 +1860,19 @@ def _failover_initial(  # pylint: disable=inconsistent-return-statements
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
-            return cls(pipeline_response, None, {})  # type: ignore
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
 
     @distributed_trace
     def begin_failover(self, resource_group_name: str, account_name: str, **kwargs: Any) -> LROPoller[None]:
@@ -1903,7 +1900,7 @@ def begin_failover(self, resource_group_name: str, account_name: str, **kwargs:
         lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
         cont_token: Optional[str] = kwargs.pop("continuation_token", None)
         if cont_token is None:
-            raw_result = self._failover_initial(  # type: ignore
+            raw_result = self._failover_initial(
                 resource_group_name=resource_group_name,
                 account_name=account_name,
                 api_version=api_version,
@@ -1912,6 +1909,7 @@ def begin_failover(self, resource_group_name: str, account_name: str, **kwargs:
                 params=_params,
                 **kwargs
             )
+            raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
@@ -1935,10 +1933,10 @@ def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-
             )
         return LROPoller[None](self._client, raw_result, get_long_running_output, polling_method)  # type: ignore
 
-    def _hierarchical_namespace_migration_initial(  # pylint: disable=inconsistent-return-statements,name-too-long
+    def _hierarchical_namespace_migration_initial(  # pylint: disable=name-too-long
         self, resource_group_name: str, account_name: str, request_type: str, **kwargs: Any
-    ) -> None:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> Iterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1950,7 +1948,7 @@ def _hierarchical_namespace_migration_initial(  # pylint: disable=inconsistent-r
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-08-01"))
-        cls: ClsType[None] = kwargs.pop("cls", None)
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
 
         _request = build_hierarchical_namespace_migration_request(
             resource_group_name=resource_group_name,
@@ -1961,10 +1959,10 @@ def _hierarchical_namespace_migration_initial(  # pylint: disable=inconsistent-r
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -1972,12 +1970,20 @@ def _hierarchical_namespace_migration_initial(  # pylint: disable=inconsistent-r
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
-            return cls(pipeline_response, None, {})  # type: ignore
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
 
     @distributed_trace
     def begin_hierarchical_namespace_migration(
@@ -2010,7 +2016,7 @@ def begin_hierarchical_namespace_migration(
         lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
         cont_token: Optional[str] = kwargs.pop("continuation_token", None)
         if cont_token is None:
-            raw_result = self._hierarchical_namespace_migration_initial(  # type: ignore
+            raw_result = self._hierarchical_namespace_migration_initial(
                 resource_group_name=resource_group_name,
                 account_name=account_name,
                 request_type=request_type,
@@ -2020,6 +2026,7 @@ def begin_hierarchical_namespace_migration(
                 params=_params,
                 **kwargs
             )
+            raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
@@ -2043,10 +2050,10 @@ def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-
             )
         return LROPoller[None](self._client, raw_result, get_long_running_output, polling_method)  # type: ignore
 
-    def _abort_hierarchical_namespace_migration_initial(  # pylint: disable=inconsistent-return-statements,name-too-long
+    def _abort_hierarchical_namespace_migration_initial(  # pylint: disable=name-too-long
         self, resource_group_name: str, account_name: str, **kwargs: Any
-    ) -> None:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> Iterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -2058,7 +2065,7 @@ def _abort_hierarchical_namespace_migration_initial(  # pylint: disable=inconsis
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-08-01"))
-        cls: ClsType[None] = kwargs.pop("cls", None)
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
 
         _request = build_abort_hierarchical_namespace_migration_request(
             resource_group_name=resource_group_name,
@@ -2068,10 +2075,10 @@ def _abort_hierarchical_namespace_migration_initial(  # pylint: disable=inconsis
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -2079,12 +2086,20 @@ def _abort_hierarchical_namespace_migration_initial(  # pylint: disable=inconsis
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
-            return cls(pipeline_response, None, {})  # type: ignore
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
 
     @distributed_trace
     def begin_abort_hierarchical_namespace_migration(  # pylint: disable=name-too-long
@@ -2112,7 +2127,7 @@ def begin_abort_hierarchical_namespace_migration(  # pylint: disable=name-too-lo
         lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
         cont_token: Optional[str] = kwargs.pop("continuation_token", None)
         if cont_token is None:
-            raw_result = self._abort_hierarchical_namespace_migration_initial(  # type: ignore
+            raw_result = self._abort_hierarchical_namespace_migration_initial(
                 resource_group_name=resource_group_name,
                 account_name=account_name,
                 api_version=api_version,
@@ -2121,6 +2136,7 @@ def begin_abort_hierarchical_namespace_migration(  # pylint: disable=name-too-lo
                 params=_params,
                 **kwargs
             )
+            raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
@@ -2150,8 +2166,8 @@ def _restore_blob_ranges_initial(
         account_name: str,
         parameters: Union[_models.BlobRestoreParameters, IO[bytes]],
         **kwargs: Any
-    ) -> _models.BlobRestoreStatus:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> Iterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -2164,7 +2180,7 @@ def _restore_blob_ranges_initial(
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-08-01"))
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
-        cls: ClsType[_models.BlobRestoreStatus] = kwargs.pop("cls", None)
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
         _json = None
@@ -2185,10 +2201,10 @@ def _restore_blob_ranges_initial(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -2196,14 +2212,14 @@ def _restore_blob_ranges_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response)
-
-        if response.status_code == 202:
-            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response)
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -2316,10 +2332,11 @@ def begin_restore_blob_ranges(
                 params=_params,
                 **kwargs
             )
+            raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):
-            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response)
+            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response.http_response)
             if cls:
                 return cls(pipeline_response, deserialized, {})  # type: ignore
             return deserialized
@@ -2360,7 +2377,7 @@ def revoke_user_delegation_keys(  # pylint: disable=inconsistent-return-statemen
         :rtype: None
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -2382,7 +2399,6 @@ def revoke_user_delegation_keys(  # pylint: disable=inconsistent-return-statemen
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/operations/_table_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/operations/_table_operations.py
index 392047979064..927a7b87847e 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/operations/_table_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/operations/_table_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 (
@@ -20,20 +19,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -255,7 +252,7 @@ def create(self, resource_group_name: str, account_name: str, table_name: str, *
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.Table
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -278,7 +275,6 @@ def create(self, resource_group_name: str, account_name: str, table_name: str, *
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -292,7 +288,7 @@ def create(self, resource_group_name: str, account_name: str, table_name: str, *
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("Table", pipeline_response)
+        deserialized = self._deserialize("Table", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -318,7 +314,7 @@ def update(self, resource_group_name: str, account_name: str, table_name: str, *
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.Table
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -341,7 +337,6 @@ def update(self, resource_group_name: str, account_name: str, table_name: str, *
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -355,7 +350,7 @@ def update(self, resource_group_name: str, account_name: str, table_name: str, *
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("Table", pipeline_response)
+        deserialized = self._deserialize("Table", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -381,7 +376,7 @@ def get(self, resource_group_name: str, account_name: str, table_name: str, **kw
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.Table
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -404,7 +399,6 @@ def get(self, resource_group_name: str, account_name: str, table_name: str, **kw
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -418,7 +412,7 @@ def get(self, resource_group_name: str, account_name: str, table_name: str, **kw
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("Table", pipeline_response)
+        deserialized = self._deserialize("Table", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -446,7 +440,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,
@@ -469,7 +463,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -507,7 +500,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> It
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-08-01"))
         cls: ClsType[_models.ListTableResource] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -526,7 +519,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -542,7 +534,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/operations/_table_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/operations/_table_services_operations.py
index 209759df9e18..0c3ed15cd3e2 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/operations/_table_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/operations/_table_services_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, Literal, Optional, Type, TypeVar, Union, overload
+from typing import Any, Callable, Dict, IO, Literal, Optional, TypeVar, Union, overload
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -19,20 +18,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -179,7 +176,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.ListTableServices
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -201,7 +198,6 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -215,7 +211,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListTableServices", pipeline_response)
+        deserialized = self._deserialize("ListTableServices", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -310,7 +306,7 @@ def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.TableServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -346,7 +342,6 @@ def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -360,7 +355,7 @@ def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("TableServiceProperties", pipeline_response)
+        deserialized = self._deserialize("TableServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -385,7 +380,7 @@ def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_08_01.models.TableServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -409,7 +404,6 @@ def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -423,7 +417,7 @@ def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("TableServiceProperties", pipeline_response)
+        deserialized = self._deserialize("TableServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/operations/_usages_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/operations/_usages_operations.py
index 2d708900e11e..3142922dbaf2 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/operations/_usages_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_08_01/operations/_usages_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 (
@@ -20,20 +19,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -105,7 +102,7 @@ def list_by_location(self, location: str, **kwargs: Any) -> Iterable["_models.Us
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-08-01"))
         cls: ClsType[_models.UsageListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -123,7 +120,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -139,7 +135,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/__init__.py
index a860a5c185c9..60980065e1ee 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/__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 ._storage_management_client import StorageManagementClient
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._storage_management_client import StorageManagementClient  # 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__ = [
     "StorageManagementClient",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/_configuration.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/_configuration.py
index 98c6fb75bea0..a1bffe64415d 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/_configuration.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/_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 StorageManagementClientConfiguration:  # pylint: disable=too-many-instance-attributes,name-too-long
+class StorageManagementClientConfiguration:  # pylint: disable=too-many-instance-attributes
     """Configuration for StorageManagementClient.
 
     Note that all parameters used to create this instance are saved as instance
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/_metadata.json b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/_metadata.json
index d704051e9df9..fe3851a8c4be 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/_metadata.json
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/_metadata.json
@@ -10,8 +10,8 @@
         "azure_arm": true,
         "has_public_lro_operations": true,
         "client_side_validation": false,
-        "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"ARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementClientConfiguration\"], \".._serialization\": [\"Deserializer\", \"Serializer\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}}",
-        "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"AsyncARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"AsyncARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementClientConfiguration\"], \"..._serialization\": [\"Deserializer\", \"Serializer\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"]}}}"
+        "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"ARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementClientConfiguration\"], \".._serialization\": [\"Deserializer\", \"Serializer\"]}, \"stdlib\": {\"typing_extensions\": [\"Self\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}}",
+        "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"AsyncARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"AsyncARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementClientConfiguration\"], \"..._serialization\": [\"Deserializer\", \"Serializer\"]}, \"stdlib\": {\"typing_extensions\": [\"Self\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"]}}}"
     },
     "global_parameters": {
         "sync": {
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/_storage_management_client.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/_storage_management_client.py
index ebb0de4cb29f..88fcfe44eca3 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/_storage_management_client.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/_storage_management_client.py
@@ -8,6 +8,7 @@
 
 from copy import deepcopy
 from typing import Any, TYPE_CHECKING
+from typing_extensions import Self
 
 from azure.core.pipeline import policies
 from azure.core.rest import HttpRequest, HttpResponse
@@ -41,11 +42,10 @@
 )
 
 if TYPE_CHECKING:
-    # pylint: disable=unused-import,ungrouped-imports
     from azure.core.credentials import TokenCredential
 
 
-class StorageManagementClient:  # pylint: disable=client-accepts-api-version-keyword,too-many-instance-attributes
+class StorageManagementClient:  # pylint: disable=too-many-instance-attributes
     """The Azure Storage Management API.
 
     :ivar operations: Operations operations
@@ -217,7 +217,7 @@ def _send_request(self, request: HttpRequest, *, stream: bool = False, **kwargs:
     def close(self) -> None:
         self._client.close()
 
-    def __enter__(self) -> "StorageManagementClient":
+    def __enter__(self) -> Self:
         self._client.__enter__()
         return self
 
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/_vendor.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/_vendor.py
deleted file mode 100644
index 0dafe0e287ff..000000000000
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/_vendor.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# --------------------------------------------------------------------------
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License. See License.txt in the project root for license information.
-# Code generated by Microsoft (R) AutoRest Code Generator.
-# Changes may cause incorrect behavior and will be lost if the code is regenerated.
-# --------------------------------------------------------------------------
-
-from azure.core.pipeline.transport import HttpRequest
-
-
-def _convert_request(request, files=None):
-    data = request.content if not files else None
-    request = HttpRequest(method=request.method, url=request.url, headers=request.headers, data=data)
-    if files:
-        request.set_formdata_body(files)
-    return request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/_version.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/_version.py
index 5a163c0afedc..e5754a47ce68 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/_version.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/_version.py
@@ -6,4 +6,4 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-VERSION = "21.2.1"
\ No newline at end of file
+VERSION = "1.0.0b1"
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/__init__.py
index a5c3d2414cfd..ee2b940bd4fc 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/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 ._storage_management_client import StorageManagementClient
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._storage_management_client import StorageManagementClient  # 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__ = [
     "StorageManagementClient",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/_configuration.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/_configuration.py
index 3a595612bb8b..296b2906d2ac 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/_configuration.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/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 StorageManagementClientConfiguration:  # pylint: disable=too-many-instance-attributes,name-too-long
+class StorageManagementClientConfiguration:  # pylint: disable=too-many-instance-attributes
     """Configuration for StorageManagementClient.
 
     Note that all parameters used to create this instance are saved as instance
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/_storage_management_client.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/_storage_management_client.py
index ccfc5e9b23db..7b47d950780b 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/_storage_management_client.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/_storage_management_client.py
@@ -8,6 +8,7 @@
 
 from copy import deepcopy
 from typing import Any, Awaitable, TYPE_CHECKING
+from typing_extensions import Self
 
 from azure.core.pipeline import policies
 from azure.core.rest import AsyncHttpResponse, HttpRequest
@@ -41,11 +42,10 @@
 )
 
 if TYPE_CHECKING:
-    # pylint: disable=unused-import,ungrouped-imports
     from azure.core.credentials_async import AsyncTokenCredential
 
 
-class StorageManagementClient:  # pylint: disable=client-accepts-api-version-keyword,too-many-instance-attributes
+class StorageManagementClient:  # pylint: disable=too-many-instance-attributes
     """The Azure Storage Management API.
 
     :ivar operations: Operations operations
@@ -222,7 +222,7 @@ def _send_request(
     async def close(self) -> None:
         await self._client.close()
 
-    async def __aenter__(self) -> "StorageManagementClient":
+    async def __aenter__(self) -> Self:
         await self._client.__aenter__()
         return self
 
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/operations/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/operations/__init__.py
index bbce85749d18..a0549517e087 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/operations/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/operations/__init__.py
@@ -5,30 +5,36 @@
 # 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 ._skus_operations import SkusOperations
-from ._storage_accounts_operations import StorageAccountsOperations
-from ._deleted_accounts_operations import DeletedAccountsOperations
-from ._usages_operations import UsagesOperations
-from ._management_policies_operations import ManagementPoliciesOperations
-from ._blob_inventory_policies_operations import BlobInventoryPoliciesOperations
-from ._private_endpoint_connections_operations import PrivateEndpointConnectionsOperations
-from ._private_link_resources_operations import PrivateLinkResourcesOperations
-from ._object_replication_policies_operations import ObjectReplicationPoliciesOperations
-from ._local_users_operations import LocalUsersOperations
-from ._encryption_scopes_operations import EncryptionScopesOperations
-from ._blob_services_operations import BlobServicesOperations
-from ._blob_containers_operations import BlobContainersOperations
-from ._file_services_operations import FileServicesOperations
-from ._file_shares_operations import FileSharesOperations
-from ._queue_services_operations import QueueServicesOperations
-from ._queue_operations import QueueOperations
-from ._table_services_operations import TableServicesOperations
-from ._table_operations import TableOperations
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._operations import Operations  # type: ignore
+from ._skus_operations import SkusOperations  # type: ignore
+from ._storage_accounts_operations import StorageAccountsOperations  # type: ignore
+from ._deleted_accounts_operations import DeletedAccountsOperations  # type: ignore
+from ._usages_operations import UsagesOperations  # type: ignore
+from ._management_policies_operations import ManagementPoliciesOperations  # type: ignore
+from ._blob_inventory_policies_operations import BlobInventoryPoliciesOperations  # type: ignore
+from ._private_endpoint_connections_operations import PrivateEndpointConnectionsOperations  # type: ignore
+from ._private_link_resources_operations import PrivateLinkResourcesOperations  # type: ignore
+from ._object_replication_policies_operations import ObjectReplicationPoliciesOperations  # type: ignore
+from ._local_users_operations import LocalUsersOperations  # type: ignore
+from ._encryption_scopes_operations import EncryptionScopesOperations  # type: ignore
+from ._blob_services_operations import BlobServicesOperations  # type: ignore
+from ._blob_containers_operations import BlobContainersOperations  # type: ignore
+from ._file_services_operations import FileServicesOperations  # type: ignore
+from ._file_shares_operations import FileSharesOperations  # type: ignore
+from ._queue_services_operations import QueueServicesOperations  # type: ignore
+from ._queue_operations import QueueOperations  # type: ignore
+from ._table_services_operations import TableServicesOperations  # type: ignore
+from ._table_operations import TableOperations  # 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__ = [
@@ -53,5 +59,5 @@
     "TableServicesOperations",
     "TableOperations",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/operations/_blob_containers_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/operations/_blob_containers_operations.py
index 38c5c5fc5bd3..08a01ee1211e 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/operations/_blob_containers_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/operations/_blob_containers_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,20 @@
 # --------------------------------------------------------------------------
 from io import IOBase
 import sys
-from typing import Any, AsyncIterable, Callable, Dict, IO, Literal, Optional, Type, TypeVar, Union, cast, overload
+from typing import (
+    Any,
+    AsyncIterable,
+    AsyncIterator,
+    Callable,
+    Dict,
+    IO,
+    Literal,
+    Optional,
+    TypeVar,
+    Union,
+    cast,
+    overload,
+)
 import urllib.parse
 
 from azure.core.async_paging import AsyncItemPaged, AsyncList
@@ -18,12 +31,13 @@
     ResourceExistsError,
     ResourceNotFoundError,
     ResourceNotModifiedError,
+    StreamClosedError,
+    StreamConsumedError,
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
 from azure.core.polling import AsyncLROPoller, AsyncNoPolling, AsyncPollingMethod
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
@@ -31,7 +45,6 @@
 from azure.mgmt.core.polling.async_arm_polling import AsyncARMPolling
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._blob_containers_operations import (
     build_clear_legal_hold_request,
     build_create_or_update_immutability_policy_request,
@@ -52,7 +65,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]]
 
@@ -117,7 +130,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-09-01"))
         cls: ClsType[_models.ListContainerItems] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -139,7 +152,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -155,7 +167,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -290,7 +301,7 @@ async def create(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -325,7 +336,6 @@ async def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -339,11 +349,7 @@ async def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("BlobContainer", pipeline_response)
-
-        if response.status_code == 201:
-            deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -453,7 +459,7 @@ async def update(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -488,7 +494,6 @@ async def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -502,7 +507,7 @@ async def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -531,7 +536,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -554,7 +559,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -568,7 +572,7 @@ async def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -576,9 +580,7 @@ async def get(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, container_name: str, **kwargs: Any
-    ) -> None:
+    async def delete(self, resource_group_name: str, account_name: str, container_name: str, **kwargs: Any) -> None:
         """Deletes specified container under its account.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -597,7 +599,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,
@@ -620,7 +622,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -743,7 +744,7 @@ async def set_legal_hold(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.LegalHold
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -778,7 +779,6 @@ async def set_legal_hold(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -792,7 +792,7 @@ async def set_legal_hold(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LegalHold", pipeline_response)
+        deserialized = self._deserialize("LegalHold", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -902,7 +902,7 @@ async def clear_legal_hold(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.LegalHold
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -937,7 +937,6 @@ async def clear_legal_hold(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -951,7 +950,7 @@ async def clear_legal_hold(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LegalHold", pipeline_response)
+        deserialized = self._deserialize("LegalHold", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1078,7 +1077,7 @@ async def create_or_update_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1119,7 +1118,6 @@ async def create_or_update_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1136,7 +1134,7 @@ async def create_or_update_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1175,7 +1173,7 @@ async def get_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1201,7 +1199,6 @@ async def get_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1218,7 +1215,7 @@ async def get_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1254,7 +1251,7 @@ async def delete_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1280,7 +1277,6 @@ async def delete_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1297,7 +1293,7 @@ async def delete_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1331,7 +1327,7 @@ async def lock_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1355,7 +1351,6 @@ async def lock_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1372,7 +1367,7 @@ async def lock_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1502,7 +1497,7 @@ async def extend_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1541,7 +1536,6 @@ async def extend_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1558,7 +1552,7 @@ async def extend_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1668,7 +1662,7 @@ async def lease(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.LeaseContainerResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1706,7 +1700,6 @@ async def lease(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1720,17 +1713,17 @@ async def lease(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LeaseContainerResponse", pipeline_response)
+        deserialized = self._deserialize("LeaseContainerResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
 
         return deserialized  # type: ignore
 
-    async def _object_level_worm_initial(  # pylint: disable=inconsistent-return-statements
+    async def _object_level_worm_initial(
         self, resource_group_name: str, account_name: str, container_name: str, **kwargs: Any
-    ) -> None:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1742,7 +1735,7 @@ async def _object_level_worm_initial(  # pylint: disable=inconsistent-return-sta
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-09-01"))
-        cls: ClsType[None] = kwargs.pop("cls", None)
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
 
         _request = build_object_level_worm_request(
             resource_group_name=resource_group_name,
@@ -1753,10 +1746,10 @@ async def _object_level_worm_initial(  # pylint: disable=inconsistent-return-sta
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -1764,11 +1757,19 @@ async def _object_level_worm_initial(  # pylint: disable=inconsistent-return-sta
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
-            return cls(pipeline_response, None, {})  # type: ignore
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
 
     @distributed_trace_async
     async def begin_object_level_worm(
@@ -1804,7 +1805,7 @@ async def begin_object_level_worm(
         lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
         cont_token: Optional[str] = kwargs.pop("continuation_token", None)
         if cont_token is None:
-            raw_result = await self._object_level_worm_initial(  # type: ignore
+            raw_result = await self._object_level_worm_initial(
                 resource_group_name=resource_group_name,
                 account_name=account_name,
                 container_name=container_name,
@@ -1814,6 +1815,7 @@ async def begin_object_level_worm(
                 params=_params,
                 **kwargs
             )
+            await raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/operations/_blob_inventory_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/operations/_blob_inventory_policies_operations.py
index 68a809bc29b4..a9724905c9ea 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/operations/_blob_inventory_policies_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/operations/_blob_inventory_policies_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._blob_inventory_policies_operations import (
     build_create_or_update_request,
     build_delete_request,
@@ -40,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]]
 
@@ -90,7 +87,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.BlobInventoryPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -113,7 +110,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -127,7 +123,7 @@ async def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response)
+        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -231,7 +227,7 @@ async def create_or_update(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.BlobInventoryPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -266,7 +262,6 @@ async def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -280,7 +275,7 @@ async def create_or_update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response)
+        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -288,7 +283,7 @@ async def create_or_update(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
+    async def delete(
         self,
         resource_group_name: str,
         account_name: str,
@@ -312,7 +307,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,
@@ -335,7 +330,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -376,7 +370,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-09-01"))
         cls: ClsType[_models.ListBlobInventoryPolicy] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -395,7 +389,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -411,7 +404,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/operations/_blob_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/operations/_blob_services_operations.py
index 81c0346fdada..e7c191bbdb22 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/operations/_blob_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/operations/_blob_services_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, Literal, Optional, Type, TypeVar, Union, overload
+from typing import Any, AsyncIterable, Callable, Dict, IO, Literal, Optional, TypeVar, Union, overload
 import urllib.parse
 
 from azure.core.async_paging import AsyncItemPaged, AsyncList
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._blob_services_operations import (
     build_get_service_properties_request,
     build_list_request,
@@ -39,7 +36,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 +86,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-09-01"))
         cls: ClsType[_models.BlobServiceItems] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -108,7 +105,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -124,7 +120,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -241,7 +236,7 @@ async def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.BlobServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -277,7 +272,6 @@ async def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -291,7 +285,7 @@ async def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobServiceProperties", pipeline_response)
+        deserialized = self._deserialize("BlobServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -316,7 +310,7 @@ async def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.BlobServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -340,7 +334,6 @@ async def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -354,7 +347,7 @@ async def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobServiceProperties", pipeline_response)
+        deserialized = self._deserialize("BlobServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/operations/_deleted_accounts_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/operations/_deleted_accounts_operations.py
index a97076c46e36..1d2273f44d8b 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/operations/_deleted_accounts_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/operations/_deleted_accounts_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
@@ -20,21 +19,19 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._deleted_accounts_operations import build_get_request, build_list_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
 
@@ -74,7 +71,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.DeletedAccount"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-09-01"))
         cls: ClsType[_models.DeletedAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -91,7 +88,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -107,7 +103,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -149,7 +144,7 @@ async def get(self, deleted_account_name: str, location: str, **kwargs: Any) ->
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.DeletedAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -171,7 +166,6 @@ async def get(self, deleted_account_name: str, location: str, **kwargs: Any) ->
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -186,7 +180,7 @@ async def get(self, deleted_account_name: str, location: str, **kwargs: Any) ->
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("DeletedAccount", pipeline_response)
+        deserialized = self._deserialize("DeletedAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/operations/_encryption_scopes_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/operations/_encryption_scopes_operations.py
index 2d972ae01381..8bda1698ae93 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/operations/_encryption_scopes_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/operations/_encryption_scopes_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._encryption_scopes_operations import (
     build_get_request,
     build_list_request,
@@ -40,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]]
 
@@ -173,7 +170,7 @@ async def put(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.EncryptionScope
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -208,7 +205,6 @@ async def put(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -223,11 +219,7 @@ async def put(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("EncryptionScope", pipeline_response)
-
-        if response.status_code == 201:
-            deserialized = self._deserialize("EncryptionScope", pipeline_response)
+        deserialized = self._deserialize("EncryptionScope", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -337,7 +329,7 @@ async def patch(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.EncryptionScope
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -372,7 +364,6 @@ async def patch(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -387,7 +378,7 @@ async def patch(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("EncryptionScope", pipeline_response)
+        deserialized = self._deserialize("EncryptionScope", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -416,7 +407,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.EncryptionScope
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -439,7 +430,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -454,7 +444,7 @@ async def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("EncryptionScope", pipeline_response)
+        deserialized = self._deserialize("EncryptionScope", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -485,7 +475,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-09-01"))
         cls: ClsType[_models.EncryptionScopeListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -504,7 +494,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -520,7 +509,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/operations/_file_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/operations/_file_services_operations.py
index cc55c8c871b6..9fb538460fe6 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/operations/_file_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/operations/_file_services_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, Literal, Optional, Type, TypeVar, Union, overload
+from typing import Any, Callable, Dict, IO, Literal, Optional, TypeVar, Union, overload
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -19,14 +18,12 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._file_services_operations import (
     build_get_service_properties_request,
     build_list_request,
@@ -36,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]]
 
@@ -76,7 +73,7 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.FileServiceItems
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -98,7 +95,6 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -112,7 +108,7 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileServiceItems", pipeline_response)
+        deserialized = self._deserialize("FileServiceItems", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -207,7 +203,7 @@ async def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.FileServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -243,7 +239,6 @@ async def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -257,7 +252,7 @@ async def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileServiceProperties", pipeline_response)
+        deserialized = self._deserialize("FileServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -282,7 +277,7 @@ async def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.FileServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -306,7 +301,6 @@ async def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -320,7 +314,7 @@ async def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileServiceProperties", pipeline_response)
+        deserialized = self._deserialize("FileServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/operations/_file_shares_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/operations/_file_shares_operations.py
index bfeeffd6da12..7aa4edefb45a 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/operations/_file_shares_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/operations/_file_shares_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._file_shares_operations import (
     build_create_request,
     build_delete_request,
@@ -43,7 +40,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]]
 
@@ -108,7 +105,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-09-01"))
         cls: ClsType[_models.FileShareItems] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -130,7 +127,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -146,7 +142,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -293,7 +288,7 @@ async def create(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.FileShare
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -329,7 +324,6 @@ async def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -343,11 +337,7 @@ async def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("FileShare", pipeline_response)
-
-        if response.status_code == 201:
-            deserialized = self._deserialize("FileShare", pipeline_response)
+        deserialized = self._deserialize("FileShare", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -457,7 +447,7 @@ async def update(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.FileShare
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -492,7 +482,6 @@ async def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -506,7 +495,7 @@ async def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileShare", pipeline_response)
+        deserialized = self._deserialize("FileShare", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -547,7 +536,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.FileShare
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -572,7 +561,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -586,7 +574,7 @@ async def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileShare", pipeline_response)
+        deserialized = self._deserialize("FileShare", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -594,7 +582,7 @@ async def get(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
+    async def delete(
         self,
         resource_group_name: str,
         account_name: str,
@@ -631,7 +619,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,
@@ -656,7 +644,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -674,7 +661,7 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             return cls(pipeline_response, None, {})  # type: ignore
 
     @overload
-    async def restore(  # pylint: disable=inconsistent-return-statements
+    async def restore(
         self,
         resource_group_name: str,
         account_name: str,
@@ -709,7 +696,7 @@ async def restore(  # pylint: disable=inconsistent-return-statements
         """
 
     @overload
-    async def restore(  # pylint: disable=inconsistent-return-statements
+    async def restore(
         self,
         resource_group_name: str,
         account_name: str,
@@ -744,7 +731,7 @@ async def restore(  # pylint: disable=inconsistent-return-statements
         """
 
     @distributed_trace_async
-    async def restore(  # pylint: disable=inconsistent-return-statements
+    async def restore(
         self,
         resource_group_name: str,
         account_name: str,
@@ -772,7 +759,7 @@ async def restore(  # 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,
@@ -807,7 +794,6 @@ async def restore(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -939,7 +925,7 @@ async def lease(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.LeaseShareResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -978,7 +964,6 @@ async def lease(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -995,7 +980,7 @@ async def lease(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("LeaseShareResponse", pipeline_response)
+        deserialized = self._deserialize("LeaseShareResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/operations/_local_users_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/operations/_local_users_operations.py
index d67d67b9a0fd..0374432a6d12 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/operations/_local_users_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/operations/_local_users_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._local_users_operations import (
     build_create_or_update_request,
     build_delete_request,
@@ -42,7 +39,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 +86,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> As
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-09-01"))
         cls: ClsType[_models.LocalUsers] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -108,7 +105,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -124,7 +120,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -172,7 +167,7 @@ async def get(self, resource_group_name: str, account_name: str, username: str,
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.LocalUser
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -195,7 +190,6 @@ async def get(self, resource_group_name: str, account_name: str, username: str,
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -210,7 +204,7 @@ async def get(self, resource_group_name: str, account_name: str, username: str,
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LocalUser", pipeline_response)
+        deserialized = self._deserialize("LocalUser", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -311,7 +305,7 @@ async def create_or_update(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.LocalUser
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -346,7 +340,6 @@ async def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -361,7 +354,7 @@ async def create_or_update(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LocalUser", pipeline_response)
+        deserialized = self._deserialize("LocalUser", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -369,9 +362,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, account_name: str, username: str, **kwargs: Any
-    ) -> None:
+    async def delete(self, resource_group_name: str, account_name: str, username: str, **kwargs: Any) -> None:
         """Deletes the local user associated with the specified storage account.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -388,7 +379,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,
@@ -411,7 +402,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -449,7 +439,7 @@ async def list_keys(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.LocalUserKeys
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -472,7 +462,6 @@ async def list_keys(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -487,7 +476,7 @@ async def list_keys(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LocalUserKeys", pipeline_response)
+        deserialized = self._deserialize("LocalUserKeys", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -514,7 +503,7 @@ async def regenerate_password(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.LocalUserRegeneratePasswordResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -537,7 +526,6 @@ async def regenerate_password(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -552,7 +540,7 @@ async def regenerate_password(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LocalUserRegeneratePasswordResult", pipeline_response)
+        deserialized = self._deserialize("LocalUserRegeneratePasswordResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/operations/_management_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/operations/_management_policies_operations.py
index e66c4ac5d7ba..a05cc2292abe 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/operations/_management_policies_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/operations/_management_policies_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,
@@ -19,14 +18,12 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._management_policies_operations import (
     build_create_or_update_request,
     build_delete_request,
@@ -36,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]]
 
@@ -86,7 +83,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.ManagementPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -109,7 +106,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -123,7 +119,7 @@ async def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ManagementPolicy", pipeline_response)
+        deserialized = self._deserialize("ManagementPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -227,7 +223,7 @@ async def create_or_update(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.ManagementPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -262,7 +258,6 @@ async def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -276,7 +271,7 @@ async def create_or_update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ManagementPolicy", pipeline_response)
+        deserialized = self._deserialize("ManagementPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -284,7 +279,7 @@ async def create_or_update(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
+    async def delete(
         self,
         resource_group_name: str,
         account_name: str,
@@ -308,7 +303,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,
@@ -331,7 +326,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/operations/_object_replication_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/operations/_object_replication_policies_operations.py
index d4b6d7185f59..96b66a037004 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/operations/_object_replication_policies_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/operations/_object_replication_policies_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._object_replication_policies_operations import (
     build_create_or_update_request,
     build_delete_request,
@@ -40,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]]
 
@@ -90,7 +87,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-09-01"))
         cls: ClsType[_models.ObjectReplicationPolicies] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -109,7 +106,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -125,7 +121,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -177,7 +172,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.ObjectReplicationPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -200,7 +195,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -215,7 +209,7 @@ async def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response)
+        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -325,7 +319,7 @@ async def create_or_update(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.ObjectReplicationPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -360,7 +354,6 @@ async def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -375,7 +368,7 @@ async def create_or_update(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response)
+        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -383,7 +376,7 @@ async def create_or_update(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
+    async def delete(
         self, resource_group_name: str, account_name: str, object_replication_policy_id: str, **kwargs: Any
     ) -> None:
         """Deletes the object replication policy associated with the specified storage account.
@@ -404,7 +397,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,
@@ -427,7 +420,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/operations/_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/operations/_operations.py
index 247ff2b3db50..70a7f9f40c70 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/operations/_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/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
@@ -20,20 +19,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._operations import build_list_request
 
 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]]
 
@@ -73,7 +70,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.Operation"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-09-01"))
         cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -89,7 +86,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -105,7 +101,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/operations/_private_endpoint_connections_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/operations/_private_endpoint_connections_operations.py
index c9f112ab935a..499349d848b8 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/operations/_private_endpoint_connections_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/operations/_private_endpoint_connections_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._private_endpoint_connections_operations import (
     build_delete_request,
     build_get_request,
@@ -40,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]]
 
@@ -90,7 +87,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-09-01"))
         cls: ClsType[_models.PrivateEndpointConnectionListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -109,7 +106,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -125,7 +121,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -174,7 +169,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.PrivateEndpointConnection
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -197,7 +192,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -212,7 +206,7 @@ async def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response)
+        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -313,7 +307,7 @@ async def put(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.PrivateEndpointConnection
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -348,7 +342,6 @@ async def put(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -363,7 +356,7 @@ async def put(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response)
+        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -371,7 +364,7 @@ async def put(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
+    async def delete(
         self, resource_group_name: str, account_name: str, private_endpoint_connection_name: str, **kwargs: Any
     ) -> None:
         """Deletes the specified private endpoint connection associated with the storage account.
@@ -390,7 +383,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,
@@ -413,7 +406,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/operations/_private_link_resources_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/operations/_private_link_resources_operations.py
index 3a41dcd4beff..9739c7078cb9 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/operations/_private_link_resources_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/operations/_private_link_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, Optional, Type, TypeVar
+from typing import Any, Callable, Dict, Optional, TypeVar
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -18,20 +17,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._private_link_resources_operations import build_list_by_storage_account_request
 
 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]]
 
@@ -73,7 +70,7 @@ async def list_by_storage_account(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.PrivateLinkResourceListResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -95,7 +92,6 @@ async def list_by_storage_account(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -109,7 +105,7 @@ async def list_by_storage_account(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("PrivateLinkResourceListResult", pipeline_response)
+        deserialized = self._deserialize("PrivateLinkResourceListResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/operations/_queue_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/operations/_queue_operations.py
index 8de4144ea38c..728fe7b6e7a3 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/operations/_queue_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/operations/_queue_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._queue_operations import (
     build_create_request,
     build_delete_request,
@@ -41,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]]
 
@@ -166,7 +163,7 @@ async def create(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.StorageQueue
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -201,7 +198,6 @@ async def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -215,7 +211,7 @@ async def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageQueue", pipeline_response)
+        deserialized = self._deserialize("StorageQueue", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -322,7 +318,7 @@ async def update(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.StorageQueue
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -357,7 +353,6 @@ async def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -371,7 +366,7 @@ async def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageQueue", pipeline_response)
+        deserialized = self._deserialize("StorageQueue", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -400,7 +395,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.StorageQueue
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -423,7 +418,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -437,7 +431,7 @@ async def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageQueue", pipeline_response)
+        deserialized = self._deserialize("StorageQueue", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -445,9 +439,7 @@ async def get(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, queue_name: str, **kwargs: Any
-    ) -> None:
+    async def delete(self, resource_group_name: str, account_name: str, queue_name: str, **kwargs: Any) -> None:
         """Deletes the queue with the specified queue name, under the specified account if it exists.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -466,7 +458,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,
@@ -489,7 +481,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -541,7 +532,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-09-01"))
         cls: ClsType[_models.ListQueueResource] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -562,7 +553,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -578,7 +568,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/operations/_queue_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/operations/_queue_services_operations.py
index 97da5387c0a5..320c73e085ab 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/operations/_queue_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/operations/_queue_services_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, Literal, Optional, Type, TypeVar, Union, overload
+from typing import Any, Callable, Dict, IO, Literal, Optional, TypeVar, Union, overload
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -19,14 +18,12 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._queue_services_operations import (
     build_get_service_properties_request,
     build_list_request,
@@ -36,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]]
 
@@ -76,7 +73,7 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.ListQueueServices
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -98,7 +95,6 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -112,7 +108,7 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListQueueServices", pipeline_response)
+        deserialized = self._deserialize("ListQueueServices", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -207,7 +203,7 @@ async def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.QueueServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -243,7 +239,6 @@ async def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -257,7 +252,7 @@ async def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("QueueServiceProperties", pipeline_response)
+        deserialized = self._deserialize("QueueServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -282,7 +277,7 @@ async def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.QueueServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -306,7 +301,6 @@ async def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -320,7 +314,7 @@ async def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("QueueServiceProperties", pipeline_response)
+        deserialized = self._deserialize("QueueServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/operations/_skus_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/operations/_skus_operations.py
index 60b5178ce934..b4c452394a3d 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/operations/_skus_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/operations/_skus_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
@@ -20,20 +19,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._skus_operations import build_list_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
 
@@ -73,7 +70,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.SkuInformation"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-09-01"))
         cls: ClsType[_models.StorageSkuListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -90,7 +87,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -106,7 +102,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/operations/_storage_accounts_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/operations/_storage_accounts_operations.py
index be274d2086a3..51e93783120a 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/operations/_storage_accounts_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/operations/_storage_accounts_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,20 @@
 # --------------------------------------------------------------------------
 from io import IOBase
 import sys
-from typing import Any, AsyncIterable, Callable, Dict, IO, Literal, Optional, Type, TypeVar, Union, cast, overload
+from typing import (
+    Any,
+    AsyncIterable,
+    AsyncIterator,
+    Callable,
+    Dict,
+    IO,
+    Literal,
+    Optional,
+    TypeVar,
+    Union,
+    cast,
+    overload,
+)
 import urllib.parse
 
 from azure.core.async_paging import AsyncItemPaged, AsyncList
@@ -18,12 +31,13 @@
     ResourceExistsError,
     ResourceNotFoundError,
     ResourceNotModifiedError,
+    StreamClosedError,
+    StreamConsumedError,
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
 from azure.core.polling import AsyncLROPoller, AsyncNoPolling, AsyncPollingMethod
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
@@ -31,7 +45,6 @@
 from azure.mgmt.core.polling.async_arm_polling import AsyncARMPolling
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._storage_accounts_operations import (
     build_abort_hierarchical_namespace_migration_request,
     build_check_name_availability_request,
@@ -54,7 +67,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]]
 
@@ -137,7 +150,7 @@ async def check_name_availability(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.CheckNameAvailabilityResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -169,7 +182,6 @@ async def check_name_availability(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -183,7 +195,7 @@ async def check_name_availability(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response)
+        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -196,8 +208,8 @@ async def _create_initial(
         account_name: str,
         parameters: Union[_models.StorageAccountCreateParameters, IO[bytes]],
         **kwargs: Any
-    ) -> Optional[_models.StorageAccount]:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -210,7 +222,7 @@ async def _create_initial(
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-09-01"))
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
-        cls: ClsType[Optional[_models.StorageAccount]] = kwargs.pop("cls", None)
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
         _json = None
@@ -231,10 +243,10 @@ async def _create_initial(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -242,12 +254,14 @@ async def _create_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = None
-        if response.status_code == 200:
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -373,10 +387,11 @@ async def begin_create(
                 params=_params,
                 **kwargs
             )
+            await raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+            deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
             if cls:
                 return cls(pipeline_response, deserialized, {})  # type: ignore
             return deserialized
@@ -399,9 +414,7 @@ def get_long_running_output(pipeline_response):
         )
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, **kwargs: Any
-    ) -> None:
+    async def delete(self, resource_group_name: str, account_name: str, **kwargs: Any) -> None:
         """Deletes a storage account in Microsoft Azure.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -415,7 +428,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,
@@ -437,7 +450,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -482,7 +494,7 @@ async def get_properties(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -505,7 +517,6 @@ async def get_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -519,7 +530,7 @@ async def get_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -630,7 +641,7 @@ async def update(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -664,7 +675,6 @@ async def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -678,7 +688,7 @@ async def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -701,7 +711,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.StorageAccount"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-09-01"))
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -718,7 +728,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -734,7 +743,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -784,7 +792,7 @@ def list_by_resource_group(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-09-01"))
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -802,7 +810,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -818,7 +825,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -868,7 +874,7 @@ async def list_keys(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.StorageAccountListKeysResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -891,7 +897,6 @@ async def list_keys(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -905,7 +910,7 @@ async def list_keys(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response)
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -999,7 +1004,7 @@ async def regenerate_key(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.StorageAccountListKeysResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1033,7 +1038,6 @@ async def regenerate_key(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1047,7 +1051,7 @@ async def regenerate_key(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response)
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1138,7 +1142,7 @@ async def list_account_sas(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.ListAccountSasResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1172,7 +1176,6 @@ async def list_account_sas(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1186,7 +1189,7 @@ async def list_account_sas(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListAccountSasResponse", pipeline_response)
+        deserialized = self._deserialize("ListAccountSasResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1275,7 +1278,7 @@ async def list_service_sas(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.ListServiceSasResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1309,7 +1312,6 @@ async def list_service_sas(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1323,17 +1325,17 @@ async def list_service_sas(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListServiceSasResponse", pipeline_response)
+        deserialized = self._deserialize("ListServiceSasResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
 
         return deserialized  # type: ignore
 
-    async def _failover_initial(  # pylint: disable=inconsistent-return-statements
+    async def _failover_initial(
         self, resource_group_name: str, account_name: str, **kwargs: Any
-    ) -> None:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1345,7 +1347,7 @@ async def _failover_initial(  # pylint: disable=inconsistent-return-statements
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-09-01"))
-        cls: ClsType[None] = kwargs.pop("cls", None)
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
 
         _request = build_failover_request(
             resource_group_name=resource_group_name,
@@ -1355,10 +1357,10 @@ async def _failover_initial(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -1366,11 +1368,19 @@ async def _failover_initial(  # pylint: disable=inconsistent-return-statements
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
-            return cls(pipeline_response, None, {})  # type: ignore
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
 
     @distributed_trace_async
     async def begin_failover(self, resource_group_name: str, account_name: str, **kwargs: Any) -> AsyncLROPoller[None]:
@@ -1398,7 +1408,7 @@ async def begin_failover(self, resource_group_name: str, account_name: str, **kw
         lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
         cont_token: Optional[str] = kwargs.pop("continuation_token", None)
         if cont_token is None:
-            raw_result = await self._failover_initial(  # type: ignore
+            raw_result = await self._failover_initial(
                 resource_group_name=resource_group_name,
                 account_name=account_name,
                 api_version=api_version,
@@ -1407,6 +1417,7 @@ async def begin_failover(self, resource_group_name: str, account_name: str, **kw
                 params=_params,
                 **kwargs
             )
+            await raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
@@ -1430,10 +1441,10 @@ def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-
             )
         return AsyncLROPoller[None](self._client, raw_result, get_long_running_output, polling_method)  # type: ignore
 
-    async def _hierarchical_namespace_migration_initial(  # pylint: disable=inconsistent-return-statements,name-too-long
+    async def _hierarchical_namespace_migration_initial(  # pylint: disable=name-too-long
         self, resource_group_name: str, account_name: str, request_type: str, **kwargs: Any
-    ) -> None:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1445,7 +1456,7 @@ async def _hierarchical_namespace_migration_initial(  # pylint: disable=inconsis
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-09-01"))
-        cls: ClsType[None] = kwargs.pop("cls", None)
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
 
         _request = build_hierarchical_namespace_migration_request(
             resource_group_name=resource_group_name,
@@ -1456,10 +1467,10 @@ async def _hierarchical_namespace_migration_initial(  # pylint: disable=inconsis
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -1467,12 +1478,20 @@ async def _hierarchical_namespace_migration_initial(  # pylint: disable=inconsis
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
-            return cls(pipeline_response, None, {})  # type: ignore
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
 
     @distributed_trace_async
     async def begin_hierarchical_namespace_migration(
@@ -1505,7 +1524,7 @@ async def begin_hierarchical_namespace_migration(
         lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
         cont_token: Optional[str] = kwargs.pop("continuation_token", None)
         if cont_token is None:
-            raw_result = await self._hierarchical_namespace_migration_initial(  # type: ignore
+            raw_result = await self._hierarchical_namespace_migration_initial(
                 resource_group_name=resource_group_name,
                 account_name=account_name,
                 request_type=request_type,
@@ -1515,6 +1534,7 @@ async def begin_hierarchical_namespace_migration(
                 params=_params,
                 **kwargs
             )
+            await raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
@@ -1538,10 +1558,10 @@ def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-
             )
         return AsyncLROPoller[None](self._client, raw_result, get_long_running_output, polling_method)  # type: ignore
 
-    async def _abort_hierarchical_namespace_migration_initial(  # pylint: disable=inconsistent-return-statements,name-too-long
+    async def _abort_hierarchical_namespace_migration_initial(  # pylint: disable=name-too-long
         self, resource_group_name: str, account_name: str, **kwargs: Any
-    ) -> None:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1553,7 +1573,7 @@ async def _abort_hierarchical_namespace_migration_initial(  # pylint: disable=in
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-09-01"))
-        cls: ClsType[None] = kwargs.pop("cls", None)
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
 
         _request = build_abort_hierarchical_namespace_migration_request(
             resource_group_name=resource_group_name,
@@ -1563,10 +1583,10 @@ async def _abort_hierarchical_namespace_migration_initial(  # pylint: disable=in
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -1574,12 +1594,20 @@ async def _abort_hierarchical_namespace_migration_initial(  # pylint: disable=in
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
-            return cls(pipeline_response, None, {})  # type: ignore
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
 
     @distributed_trace_async
     async def begin_abort_hierarchical_namespace_migration(  # pylint: disable=name-too-long
@@ -1607,7 +1635,7 @@ async def begin_abort_hierarchical_namespace_migration(  # pylint: disable=name-
         lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
         cont_token: Optional[str] = kwargs.pop("continuation_token", None)
         if cont_token is None:
-            raw_result = await self._abort_hierarchical_namespace_migration_initial(  # type: ignore
+            raw_result = await self._abort_hierarchical_namespace_migration_initial(
                 resource_group_name=resource_group_name,
                 account_name=account_name,
                 api_version=api_version,
@@ -1616,6 +1644,7 @@ async def begin_abort_hierarchical_namespace_migration(  # pylint: disable=name-
                 params=_params,
                 **kwargs
             )
+            await raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
@@ -1645,8 +1674,8 @@ async def _restore_blob_ranges_initial(
         account_name: str,
         parameters: Union[_models.BlobRestoreParameters, IO[bytes]],
         **kwargs: Any
-    ) -> _models.BlobRestoreStatus:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1659,7 +1688,7 @@ async def _restore_blob_ranges_initial(
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-09-01"))
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
-        cls: ClsType[_models.BlobRestoreStatus] = kwargs.pop("cls", None)
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
         _json = None
@@ -1680,10 +1709,10 @@ async def _restore_blob_ranges_initial(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -1691,14 +1720,14 @@ async def _restore_blob_ranges_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response)
-
-        if response.status_code == 202:
-            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response)
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1814,10 +1843,11 @@ async def begin_restore_blob_ranges(
                 params=_params,
                 **kwargs
             )
+            await raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):
-            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response)
+            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response.http_response)
             if cls:
                 return cls(pipeline_response, deserialized, {})  # type: ignore
             return deserialized
@@ -1842,9 +1872,7 @@ def get_long_running_output(pipeline_response):
         )
 
     @distributed_trace_async
-    async def revoke_user_delegation_keys(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, **kwargs: Any
-    ) -> None:
+    async def revoke_user_delegation_keys(self, resource_group_name: str, account_name: str, **kwargs: Any) -> None:
         """Revoke user delegation keys.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -1858,7 +1886,7 @@ async def revoke_user_delegation_keys(  # pylint: disable=inconsistent-return-st
         :rtype: None
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1880,7 +1908,6 @@ async def revoke_user_delegation_keys(  # pylint: disable=inconsistent-return-st
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/operations/_table_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/operations/_table_operations.py
index 2f7837056403..af922ed44dcd 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/operations/_table_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/operations/_table_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._table_operations import (
     build_create_request,
     build_delete_request,
@@ -41,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]]
 
@@ -163,7 +160,7 @@ async def create(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.Table
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -201,7 +198,6 @@ async def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -215,7 +211,7 @@ async def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("Table", pipeline_response)
+        deserialized = self._deserialize("Table", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -319,7 +315,7 @@ async def update(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.Table
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -357,7 +353,6 @@ async def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -371,7 +366,7 @@ async def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("Table", pipeline_response)
+        deserialized = self._deserialize("Table", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -397,7 +392,7 @@ async def get(self, resource_group_name: str, account_name: str, table_name: str
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.Table
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -420,7 +415,6 @@ async def get(self, resource_group_name: str, account_name: str, table_name: str
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -434,7 +428,7 @@ async def get(self, resource_group_name: str, account_name: str, table_name: str
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("Table", pipeline_response)
+        deserialized = self._deserialize("Table", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -442,9 +436,7 @@ async def get(self, resource_group_name: str, account_name: str, table_name: str
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, table_name: str, **kwargs: Any
-    ) -> None:
+    async def delete(self, resource_group_name: str, account_name: str, table_name: str, **kwargs: Any) -> None:
         """Deletes the table with the specified table name, under the specified account if it exists.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -462,7 +454,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,
@@ -485,7 +477,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -523,7 +514,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> As
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-09-01"))
         cls: ClsType[_models.ListTableResource] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -542,7 +533,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -558,7 +548,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/operations/_table_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/operations/_table_services_operations.py
index 289f7616738e..5b0793ca1684 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/operations/_table_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/operations/_table_services_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, Literal, Optional, Type, TypeVar, Union, overload
+from typing import Any, Callable, Dict, IO, Literal, Optional, TypeVar, Union, overload
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -19,14 +18,12 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._table_services_operations import (
     build_get_service_properties_request,
     build_list_request,
@@ -36,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]]
 
@@ -76,7 +73,7 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.ListTableServices
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -98,7 +95,6 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -112,7 +108,7 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListTableServices", pipeline_response)
+        deserialized = self._deserialize("ListTableServices", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -207,7 +203,7 @@ async def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.TableServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -243,7 +239,6 @@ async def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -257,7 +252,7 @@ async def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("TableServiceProperties", pipeline_response)
+        deserialized = self._deserialize("TableServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -282,7 +277,7 @@ async def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.TableServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -306,7 +301,6 @@ async def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -320,7 +314,7 @@ async def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("TableServiceProperties", pipeline_response)
+        deserialized = self._deserialize("TableServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/operations/_usages_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/operations/_usages_operations.py
index 46a350ed798c..61765eb052c9 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/operations/_usages_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/aio/operations/_usages_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
@@ -20,20 +19,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._usages_operations import build_list_by_location_request
 
 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 +72,7 @@ def list_by_location(self, location: str, **kwargs: Any) -> AsyncIterable["_mode
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-09-01"))
         cls: ClsType[_models.UsageListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -93,7 +90,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -109,7 +105,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/models/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/models/__init__.py
index 9f9db63bf9f0..dbdcdf7988f2 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/models/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/models/__init__.py
@@ -5,222 +5,233 @@
 # 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 AccessPolicy
-from ._models_py3 import AccountImmutabilityPolicyProperties
-from ._models_py3 import AccountSasParameters
-from ._models_py3 import ActiveDirectoryProperties
-from ._models_py3 import AzureEntityResource
-from ._models_py3 import AzureFilesIdentityBasedAuthentication
-from ._models_py3 import BlobContainer
-from ._models_py3 import BlobInventoryPolicy
-from ._models_py3 import BlobInventoryPolicyDefinition
-from ._models_py3 import BlobInventoryPolicyFilter
-from ._models_py3 import BlobInventoryPolicyRule
-from ._models_py3 import BlobInventoryPolicySchema
-from ._models_py3 import BlobRestoreParameters
-from ._models_py3 import BlobRestoreRange
-from ._models_py3 import BlobRestoreStatus
-from ._models_py3 import BlobServiceItems
-from ._models_py3 import BlobServiceProperties
-from ._models_py3 import ChangeFeed
-from ._models_py3 import CheckNameAvailabilityResult
-from ._models_py3 import CloudErrorBody
-from ._models_py3 import CorsRule
-from ._models_py3 import CorsRules
-from ._models_py3 import CustomDomain
-from ._models_py3 import DateAfterCreation
-from ._models_py3 import DateAfterModification
-from ._models_py3 import DeleteRetentionPolicy
-from ._models_py3 import DeletedAccount
-from ._models_py3 import DeletedAccountListResult
-from ._models_py3 import DeletedShare
-from ._models_py3 import Dimension
-from ._models_py3 import Encryption
-from ._models_py3 import EncryptionIdentity
-from ._models_py3 import EncryptionScope
-from ._models_py3 import EncryptionScopeKeyVaultProperties
-from ._models_py3 import EncryptionScopeListResult
-from ._models_py3 import EncryptionService
-from ._models_py3 import EncryptionServices
-from ._models_py3 import Endpoints
-from ._models_py3 import ErrorResponse
-from ._models_py3 import ErrorResponseBody
-from ._models_py3 import ExtendedLocation
-from ._models_py3 import FileServiceItems
-from ._models_py3 import FileServiceProperties
-from ._models_py3 import FileShare
-from ._models_py3 import FileShareItem
-from ._models_py3 import FileShareItems
-from ._models_py3 import GeoReplicationStats
-from ._models_py3 import IPRule
-from ._models_py3 import Identity
-from ._models_py3 import ImmutabilityPolicy
-from ._models_py3 import ImmutabilityPolicyProperties
-from ._models_py3 import ImmutableStorageAccount
-from ._models_py3 import ImmutableStorageWithVersioning
-from ._models_py3 import KeyCreationTime
-from ._models_py3 import KeyPolicy
-from ._models_py3 import KeyVaultProperties
-from ._models_py3 import LastAccessTimeTrackingPolicy
-from ._models_py3 import LeaseContainerRequest
-from ._models_py3 import LeaseContainerResponse
-from ._models_py3 import LeaseShareRequest
-from ._models_py3 import LeaseShareResponse
-from ._models_py3 import LegalHold
-from ._models_py3 import LegalHoldProperties
-from ._models_py3 import ListAccountSasResponse
-from ._models_py3 import ListBlobInventoryPolicy
-from ._models_py3 import ListContainerItem
-from ._models_py3 import ListContainerItems
-from ._models_py3 import ListQueue
-from ._models_py3 import ListQueueResource
-from ._models_py3 import ListQueueServices
-from ._models_py3 import ListServiceSasResponse
-from ._models_py3 import ListTableResource
-from ._models_py3 import ListTableServices
-from ._models_py3 import LocalUser
-from ._models_py3 import LocalUserKeys
-from ._models_py3 import LocalUserRegeneratePasswordResult
-from ._models_py3 import LocalUsers
-from ._models_py3 import ManagementPolicy
-from ._models_py3 import ManagementPolicyAction
-from ._models_py3 import ManagementPolicyBaseBlob
-from ._models_py3 import ManagementPolicyDefinition
-from ._models_py3 import ManagementPolicyFilter
-from ._models_py3 import ManagementPolicyRule
-from ._models_py3 import ManagementPolicySchema
-from ._models_py3 import ManagementPolicySnapShot
-from ._models_py3 import ManagementPolicyVersion
-from ._models_py3 import MetricSpecification
-from ._models_py3 import Multichannel
-from ._models_py3 import NetworkRuleSet
-from ._models_py3 import ObjectReplicationPolicies
-from ._models_py3 import ObjectReplicationPolicy
-from ._models_py3 import ObjectReplicationPolicyFilter
-from ._models_py3 import ObjectReplicationPolicyRule
-from ._models_py3 import Operation
-from ._models_py3 import OperationDisplay
-from ._models_py3 import OperationListResult
-from ._models_py3 import PermissionScope
-from ._models_py3 import PrivateEndpoint
-from ._models_py3 import PrivateEndpointConnection
-from ._models_py3 import PrivateEndpointConnectionListResult
-from ._models_py3 import PrivateLinkResource
-from ._models_py3 import PrivateLinkResourceListResult
-from ._models_py3 import PrivateLinkServiceConnectionState
-from ._models_py3 import ProtectedAppendWritesHistory
-from ._models_py3 import ProtocolSettings
-from ._models_py3 import ProxyResource
-from ._models_py3 import QueueServiceProperties
-from ._models_py3 import Resource
-from ._models_py3 import ResourceAccessRule
-from ._models_py3 import RestorePolicyProperties
-from ._models_py3 import Restriction
-from ._models_py3 import RoutingPreference
-from ._models_py3 import SKUCapability
-from ._models_py3 import SasPolicy
-from ._models_py3 import ServiceSasParameters
-from ._models_py3 import ServiceSpecification
-from ._models_py3 import SignedIdentifier
-from ._models_py3 import Sku
-from ._models_py3 import SkuInformation
-from ._models_py3 import SmbSetting
-from ._models_py3 import SshPublicKey
-from ._models_py3 import StorageAccount
-from ._models_py3 import StorageAccountCheckNameAvailabilityParameters
-from ._models_py3 import StorageAccountCreateParameters
-from ._models_py3 import StorageAccountInternetEndpoints
-from ._models_py3 import StorageAccountKey
-from ._models_py3 import StorageAccountListKeysResult
-from ._models_py3 import StorageAccountListResult
-from ._models_py3 import StorageAccountMicrosoftEndpoints
-from ._models_py3 import StorageAccountRegenerateKeyParameters
-from ._models_py3 import StorageAccountSkuConversionStatus
-from ._models_py3 import StorageAccountUpdateParameters
-from ._models_py3 import StorageQueue
-from ._models_py3 import StorageSkuListResult
-from ._models_py3 import SystemData
-from ._models_py3 import Table
-from ._models_py3 import TableAccessPolicy
-from ._models_py3 import TableServiceProperties
-from ._models_py3 import TableSignedIdentifier
-from ._models_py3 import TagFilter
-from ._models_py3 import TagProperty
-from ._models_py3 import TrackedResource
-from ._models_py3 import UpdateHistoryProperty
-from ._models_py3 import Usage
-from ._models_py3 import UsageListResult
-from ._models_py3 import UsageName
-from ._models_py3 import UserAssignedIdentity
-from ._models_py3 import VirtualNetworkRule
+from typing import TYPE_CHECKING
 
-from ._storage_management_client_enums import AccessTier
-from ._storage_management_client_enums import AccountImmutabilityPolicyState
-from ._storage_management_client_enums import AccountStatus
-from ._storage_management_client_enums import ActiveDirectoryPropertiesAccountType
-from ._storage_management_client_enums import AllowedCopyScope
-from ._storage_management_client_enums import BlobInventoryPolicyName
-from ._storage_management_client_enums import BlobRestoreProgressStatus
-from ._storage_management_client_enums import Bypass
-from ._storage_management_client_enums import CorsRuleAllowedMethodsItem
-from ._storage_management_client_enums import CreatedByType
-from ._storage_management_client_enums import DefaultAction
-from ._storage_management_client_enums import DefaultSharePermission
-from ._storage_management_client_enums import DirectoryServiceOptions
-from ._storage_management_client_enums import DnsEndpointType
-from ._storage_management_client_enums import EnabledProtocols
-from ._storage_management_client_enums import EncryptionScopeSource
-from ._storage_management_client_enums import EncryptionScopeState
-from ._storage_management_client_enums import ExpirationAction
-from ._storage_management_client_enums import ExtendedLocationTypes
-from ._storage_management_client_enums import Format
-from ._storage_management_client_enums import GeoReplicationStatus
-from ._storage_management_client_enums import HttpProtocol
-from ._storage_management_client_enums import IdentityType
-from ._storage_management_client_enums import ImmutabilityPolicyState
-from ._storage_management_client_enums import ImmutabilityPolicyUpdateType
-from ._storage_management_client_enums import InventoryRuleType
-from ._storage_management_client_enums import KeyPermission
-from ._storage_management_client_enums import KeySource
-from ._storage_management_client_enums import KeyType
-from ._storage_management_client_enums import Kind
-from ._storage_management_client_enums import LargeFileSharesState
-from ._storage_management_client_enums import LeaseContainerRequestAction
-from ._storage_management_client_enums import LeaseDuration
-from ._storage_management_client_enums import LeaseShareAction
-from ._storage_management_client_enums import LeaseState
-from ._storage_management_client_enums import LeaseStatus
-from ._storage_management_client_enums import ListContainersInclude
-from ._storage_management_client_enums import ManagementPolicyName
-from ._storage_management_client_enums import MigrationState
-from ._storage_management_client_enums import MinimumTlsVersion
-from ._storage_management_client_enums import Name
-from ._storage_management_client_enums import ObjectType
-from ._storage_management_client_enums import Permissions
-from ._storage_management_client_enums import PrivateEndpointConnectionProvisioningState
-from ._storage_management_client_enums import PrivateEndpointServiceConnectionStatus
-from ._storage_management_client_enums import ProvisioningState
-from ._storage_management_client_enums import PublicAccess
-from ._storage_management_client_enums import PublicNetworkAccess
-from ._storage_management_client_enums import Reason
-from ._storage_management_client_enums import ReasonCode
-from ._storage_management_client_enums import RootSquashType
-from ._storage_management_client_enums import RoutingChoice
-from ._storage_management_client_enums import RuleType
-from ._storage_management_client_enums import Schedule
-from ._storage_management_client_enums import Services
-from ._storage_management_client_enums import ShareAccessTier
-from ._storage_management_client_enums import SignedResource
-from ._storage_management_client_enums import SignedResourceTypes
-from ._storage_management_client_enums import SkuConversionStatus
-from ._storage_management_client_enums import SkuName
-from ._storage_management_client_enums import SkuTier
-from ._storage_management_client_enums import State
-from ._storage_management_client_enums import StorageAccountExpand
-from ._storage_management_client_enums import UsageUnit
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+
+from ._models_py3 import (  # type: ignore
+    AccessPolicy,
+    AccountImmutabilityPolicyProperties,
+    AccountSasParameters,
+    ActiveDirectoryProperties,
+    AzureEntityResource,
+    AzureFilesIdentityBasedAuthentication,
+    BlobContainer,
+    BlobInventoryPolicy,
+    BlobInventoryPolicyDefinition,
+    BlobInventoryPolicyFilter,
+    BlobInventoryPolicyRule,
+    BlobInventoryPolicySchema,
+    BlobRestoreParameters,
+    BlobRestoreRange,
+    BlobRestoreStatus,
+    BlobServiceItems,
+    BlobServiceProperties,
+    ChangeFeed,
+    CheckNameAvailabilityResult,
+    CloudErrorBody,
+    CorsRule,
+    CorsRules,
+    CustomDomain,
+    DateAfterCreation,
+    DateAfterModification,
+    DeleteRetentionPolicy,
+    DeletedAccount,
+    DeletedAccountListResult,
+    DeletedShare,
+    Dimension,
+    Encryption,
+    EncryptionIdentity,
+    EncryptionScope,
+    EncryptionScopeKeyVaultProperties,
+    EncryptionScopeListResult,
+    EncryptionService,
+    EncryptionServices,
+    Endpoints,
+    ErrorResponse,
+    ErrorResponseBody,
+    ExtendedLocation,
+    FileServiceItems,
+    FileServiceProperties,
+    FileShare,
+    FileShareItem,
+    FileShareItems,
+    GeoReplicationStats,
+    IPRule,
+    Identity,
+    ImmutabilityPolicy,
+    ImmutabilityPolicyProperties,
+    ImmutableStorageAccount,
+    ImmutableStorageWithVersioning,
+    KeyCreationTime,
+    KeyPolicy,
+    KeyVaultProperties,
+    LastAccessTimeTrackingPolicy,
+    LeaseContainerRequest,
+    LeaseContainerResponse,
+    LeaseShareRequest,
+    LeaseShareResponse,
+    LegalHold,
+    LegalHoldProperties,
+    ListAccountSasResponse,
+    ListBlobInventoryPolicy,
+    ListContainerItem,
+    ListContainerItems,
+    ListQueue,
+    ListQueueResource,
+    ListQueueServices,
+    ListServiceSasResponse,
+    ListTableResource,
+    ListTableServices,
+    LocalUser,
+    LocalUserKeys,
+    LocalUserRegeneratePasswordResult,
+    LocalUsers,
+    ManagementPolicy,
+    ManagementPolicyAction,
+    ManagementPolicyBaseBlob,
+    ManagementPolicyDefinition,
+    ManagementPolicyFilter,
+    ManagementPolicyRule,
+    ManagementPolicySchema,
+    ManagementPolicySnapShot,
+    ManagementPolicyVersion,
+    MetricSpecification,
+    Multichannel,
+    NetworkRuleSet,
+    ObjectReplicationPolicies,
+    ObjectReplicationPolicy,
+    ObjectReplicationPolicyFilter,
+    ObjectReplicationPolicyRule,
+    Operation,
+    OperationDisplay,
+    OperationListResult,
+    PermissionScope,
+    PrivateEndpoint,
+    PrivateEndpointConnection,
+    PrivateEndpointConnectionListResult,
+    PrivateLinkResource,
+    PrivateLinkResourceListResult,
+    PrivateLinkServiceConnectionState,
+    ProtectedAppendWritesHistory,
+    ProtocolSettings,
+    ProxyResource,
+    QueueServiceProperties,
+    Resource,
+    ResourceAccessRule,
+    RestorePolicyProperties,
+    Restriction,
+    RoutingPreference,
+    SKUCapability,
+    SasPolicy,
+    ServiceSasParameters,
+    ServiceSpecification,
+    SignedIdentifier,
+    Sku,
+    SkuInformation,
+    SmbSetting,
+    SshPublicKey,
+    StorageAccount,
+    StorageAccountCheckNameAvailabilityParameters,
+    StorageAccountCreateParameters,
+    StorageAccountInternetEndpoints,
+    StorageAccountKey,
+    StorageAccountListKeysResult,
+    StorageAccountListResult,
+    StorageAccountMicrosoftEndpoints,
+    StorageAccountRegenerateKeyParameters,
+    StorageAccountSkuConversionStatus,
+    StorageAccountUpdateParameters,
+    StorageQueue,
+    StorageSkuListResult,
+    SystemData,
+    Table,
+    TableAccessPolicy,
+    TableServiceProperties,
+    TableSignedIdentifier,
+    TagFilter,
+    TagProperty,
+    TrackedResource,
+    UpdateHistoryProperty,
+    Usage,
+    UsageListResult,
+    UsageName,
+    UserAssignedIdentity,
+    VirtualNetworkRule,
+)
+
+from ._storage_management_client_enums import (  # type: ignore
+    AccessTier,
+    AccountImmutabilityPolicyState,
+    AccountStatus,
+    ActiveDirectoryPropertiesAccountType,
+    AllowedCopyScope,
+    BlobInventoryPolicyName,
+    BlobRestoreProgressStatus,
+    Bypass,
+    CorsRuleAllowedMethodsItem,
+    CreatedByType,
+    DefaultAction,
+    DefaultSharePermission,
+    DirectoryServiceOptions,
+    DnsEndpointType,
+    EnabledProtocols,
+    EncryptionScopeSource,
+    EncryptionScopeState,
+    ExpirationAction,
+    ExtendedLocationTypes,
+    Format,
+    GeoReplicationStatus,
+    HttpProtocol,
+    IdentityType,
+    ImmutabilityPolicyState,
+    ImmutabilityPolicyUpdateType,
+    InventoryRuleType,
+    KeyPermission,
+    KeySource,
+    KeyType,
+    Kind,
+    LargeFileSharesState,
+    LeaseContainerRequestAction,
+    LeaseDuration,
+    LeaseShareAction,
+    LeaseState,
+    LeaseStatus,
+    ListContainersInclude,
+    ManagementPolicyName,
+    MigrationState,
+    MinimumTlsVersion,
+    Name,
+    ObjectType,
+    Permissions,
+    PrivateEndpointConnectionProvisioningState,
+    PrivateEndpointServiceConnectionStatus,
+    ProvisioningState,
+    PublicAccess,
+    PublicNetworkAccess,
+    Reason,
+    ReasonCode,
+    RootSquashType,
+    RoutingChoice,
+    RuleType,
+    Schedule,
+    Services,
+    ShareAccessTier,
+    SignedResource,
+    SignedResourceTypes,
+    SkuConversionStatus,
+    SkuName,
+    SkuTier,
+    State,
+    StorageAccountExpand,
+    UsageUnit,
+)
 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__ = [
@@ -437,5 +448,5 @@
     "StorageAccountExpand",
     "UsageUnit",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/models/_models_py3.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/models/_models_py3.py
index 6a1d7b07dab9..73f1af3a088d 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/models/_models_py3.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/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
 
 
@@ -444,7 +443,7 @@ def __init__(
         self.default_share_permission = default_share_permission
 
 
-class BlobContainer(AzureEntityResource):  # pylint: disable=too-many-instance-attributes
+class BlobContainer(AzureEntityResource):
     """Properties of the blob container, including Id, resource name, resource type, Etag.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -1111,7 +1110,7 @@ def __init__(self, **kwargs: Any) -> None:
         self.value = None
 
 
-class BlobServiceProperties(Resource):  # pylint: disable=too-many-instance-attributes
+class BlobServiceProperties(Resource):
     """The properties of a storage account’s Blob service.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -2432,7 +2431,7 @@ def __init__(
         self.protocol_settings = protocol_settings
 
 
-class FileShare(AzureEntityResource):  # pylint: disable=too-many-instance-attributes
+class FileShare(AzureEntityResource):
     """Properties of the file share, including Id, resource name, resource type, Etag.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -2590,7 +2589,7 @@ def __init__(
         self.snapshot_time = None
 
 
-class FileShareItem(AzureEntityResource):  # pylint: disable=too-many-instance-attributes
+class FileShareItem(AzureEntityResource):
     """The file share properties be listed out.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -3354,7 +3353,7 @@ class LeaseContainerRequest(_serialization.Model):
     All required parameters must be populated in order to send to server.
 
     :ivar action: Specifies the lease action. Can be one of the available actions. Required. Known
-     values are: "Acquire", "Renew", "Change", "Release", and "Break".
+     values are: "Acquire", "Renew", "Change", "Release", "Break", and "Break".
     :vartype action: str or ~azure.mgmt.storage.v2021_09_01.models.LeaseContainerRequestAction
     :ivar lease_id: Identifies the lease. Can be specified in any valid GUID string format.
     :vartype lease_id: str
@@ -3393,7 +3392,7 @@ def __init__(
     ) -> None:
         """
         :keyword action: Specifies the lease action. Can be one of the available actions. Required.
-         Known values are: "Acquire", "Renew", "Change", "Release", and "Break".
+         Known values are: "Acquire", "Renew", "Change", "Release", "Break", and "Break".
         :paramtype action: str or ~azure.mgmt.storage.v2021_09_01.models.LeaseContainerRequestAction
         :keyword lease_id: Identifies the lease. Can be specified in any valid GUID string format.
         :paramtype lease_id: str
@@ -3451,7 +3450,7 @@ class LeaseShareRequest(_serialization.Model):
     All required parameters must be populated in order to send to server.
 
     :ivar action: Specifies the lease action. Can be one of the available actions. Required. Known
-     values are: "Acquire", "Renew", "Change", "Release", and "Break".
+     values are: "Acquire", "Renew", "Change", "Release", "Break", and "Break".
     :vartype action: str or ~azure.mgmt.storage.v2021_09_01.models.LeaseShareAction
     :ivar lease_id: Identifies the lease. Can be specified in any valid GUID string format.
     :vartype lease_id: str
@@ -3490,7 +3489,7 @@ def __init__(
     ) -> None:
         """
         :keyword action: Specifies the lease action. Can be one of the available actions. Required.
-         Known values are: "Acquire", "Renew", "Change", "Release", and "Break".
+         Known values are: "Acquire", "Renew", "Change", "Release", "Break", and "Break".
         :paramtype action: str or ~azure.mgmt.storage.v2021_09_01.models.LeaseShareAction
         :keyword lease_id: Identifies the lease. Can be specified in any valid GUID string format.
         :paramtype lease_id: str
@@ -3688,7 +3687,7 @@ def __init__(self, **kwargs: Any) -> None:
         self.value = None
 
 
-class ListContainerItem(AzureEntityResource):  # pylint: disable=too-many-instance-attributes
+class ListContainerItem(AzureEntityResource):
     """The blob container properties be listed out.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -4056,7 +4055,7 @@ def __init__(self, **kwargs: Any) -> None:
         self.value = None
 
 
-class LocalUser(Resource):  # pylint: disable=too-many-instance-attributes
+class LocalUser(Resource):
     """The local user associated with the storage accounts.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -5654,7 +5653,7 @@ def __init__(
         self.expiration_action = expiration_action
 
 
-class ServiceSasParameters(_serialization.Model):  # pylint: disable=too-many-instance-attributes
+class ServiceSasParameters(_serialization.Model):
     """The parameters to list service SAS credentials of a specific resource.
 
     All required parameters must be populated in order to send to server.
@@ -6088,7 +6087,7 @@ class SshPublicKey(_serialization.Model):
 
     :ivar description: Optional. It is used to store the function/usage of the key.
     :vartype description: str
-    :ivar key: Ssh public key base64 encoded. The format should be: ':code:`<keyType>`
+    :ivar key: Ssh public key base64 encoded. The format should be: '\\ :code:`<keyType>`
      :code:`<keyData>`', e.g. ssh-rsa AAAABBBB.
     :vartype key: str
     """
@@ -6102,7 +6101,7 @@ def __init__(self, *, description: Optional[str] = None, key: Optional[str] = No
         """
         :keyword description: Optional. It is used to store the function/usage of the key.
         :paramtype description: str
-        :keyword key: Ssh public key base64 encoded. The format should be: ':code:`<keyType>`
+        :keyword key: Ssh public key base64 encoded. The format should be: '\\ :code:`<keyType>`
          :code:`<keyData>`', e.g. ssh-rsa AAAABBBB.
         :paramtype key: str
         """
@@ -6160,7 +6159,7 @@ def __init__(self, *, location: str, tags: Optional[Dict[str, str]] = None, **kw
         self.location = location
 
 
-class StorageAccount(TrackedResource):  # pylint: disable=too-many-instance-attributes
+class StorageAccount(TrackedResource):
     """The storage account.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -6580,7 +6579,7 @@ def __init__(self, *, name: str, **kwargs: Any) -> None:
         self.name = name
 
 
-class StorageAccountCreateParameters(_serialization.Model):  # pylint: disable=too-many-instance-attributes
+class StorageAccountCreateParameters(_serialization.Model):
     """The parameters used when creating a storage account.
 
     All required parameters must be populated in order to send to server.
@@ -7149,7 +7148,7 @@ def __init__(self, *, target_sku_name: Optional[Union[str, "_models.SkuName"]] =
         self.end_time = None
 
 
-class StorageAccountUpdateParameters(_serialization.Model):  # pylint: disable=too-many-instance-attributes
+class StorageAccountUpdateParameters(_serialization.Model):
     """The parameters that can be provided when updating the storage account properties.
 
     :ivar sku: Gets or sets the SKU name. Note that the SKU name cannot be updated to Standard_ZRS,
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/models/_storage_management_client_enums.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/models/_storage_management_client_enums.py
index 93ca2cf7d001..c3e3e891adb6 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/models/_storage_management_client_enums.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/models/_storage_management_client_enums.py
@@ -291,6 +291,7 @@ class LeaseContainerRequestAction(str, Enum, metaclass=CaseInsensitiveEnumMeta):
     RENEW = "Renew"
     CHANGE = "Change"
     RELEASE = "Release"
+    BREAK = "Break"
     BREAK_ENUM = "Break"
 
 
@@ -310,6 +311,7 @@ class LeaseShareAction(str, Enum, metaclass=CaseInsensitiveEnumMeta):
     RENEW = "Renew"
     CHANGE = "Change"
     RELEASE = "Release"
+    BREAK = "Break"
     BREAK_ENUM = "Break"
 
 
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/operations/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/operations/__init__.py
index bbce85749d18..a0549517e087 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/operations/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/operations/__init__.py
@@ -5,30 +5,36 @@
 # 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 ._skus_operations import SkusOperations
-from ._storage_accounts_operations import StorageAccountsOperations
-from ._deleted_accounts_operations import DeletedAccountsOperations
-from ._usages_operations import UsagesOperations
-from ._management_policies_operations import ManagementPoliciesOperations
-from ._blob_inventory_policies_operations import BlobInventoryPoliciesOperations
-from ._private_endpoint_connections_operations import PrivateEndpointConnectionsOperations
-from ._private_link_resources_operations import PrivateLinkResourcesOperations
-from ._object_replication_policies_operations import ObjectReplicationPoliciesOperations
-from ._local_users_operations import LocalUsersOperations
-from ._encryption_scopes_operations import EncryptionScopesOperations
-from ._blob_services_operations import BlobServicesOperations
-from ._blob_containers_operations import BlobContainersOperations
-from ._file_services_operations import FileServicesOperations
-from ._file_shares_operations import FileSharesOperations
-from ._queue_services_operations import QueueServicesOperations
-from ._queue_operations import QueueOperations
-from ._table_services_operations import TableServicesOperations
-from ._table_operations import TableOperations
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._operations import Operations  # type: ignore
+from ._skus_operations import SkusOperations  # type: ignore
+from ._storage_accounts_operations import StorageAccountsOperations  # type: ignore
+from ._deleted_accounts_operations import DeletedAccountsOperations  # type: ignore
+from ._usages_operations import UsagesOperations  # type: ignore
+from ._management_policies_operations import ManagementPoliciesOperations  # type: ignore
+from ._blob_inventory_policies_operations import BlobInventoryPoliciesOperations  # type: ignore
+from ._private_endpoint_connections_operations import PrivateEndpointConnectionsOperations  # type: ignore
+from ._private_link_resources_operations import PrivateLinkResourcesOperations  # type: ignore
+from ._object_replication_policies_operations import ObjectReplicationPoliciesOperations  # type: ignore
+from ._local_users_operations import LocalUsersOperations  # type: ignore
+from ._encryption_scopes_operations import EncryptionScopesOperations  # type: ignore
+from ._blob_services_operations import BlobServicesOperations  # type: ignore
+from ._blob_containers_operations import BlobContainersOperations  # type: ignore
+from ._file_services_operations import FileServicesOperations  # type: ignore
+from ._file_shares_operations import FileSharesOperations  # type: ignore
+from ._queue_services_operations import QueueServicesOperations  # type: ignore
+from ._queue_operations import QueueOperations  # type: ignore
+from ._table_services_operations import TableServicesOperations  # type: ignore
+from ._table_operations import TableOperations  # 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__ = [
@@ -53,5 +59,5 @@
     "TableServicesOperations",
     "TableOperations",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/operations/_blob_containers_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/operations/_blob_containers_operations.py
index 209cc2a90885..cb360b762479 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/operations/_blob_containers_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/operations/_blob_containers_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,7 @@
 # --------------------------------------------------------------------------
 from io import IOBase
 import sys
-from typing import Any, Callable, Dict, IO, Iterable, Literal, Optional, Type, TypeVar, Union, cast, overload
+from typing import Any, Callable, Dict, IO, Iterable, Iterator, Literal, Optional, TypeVar, Union, cast, overload
 import urllib.parse
 
 from azure.core.exceptions import (
@@ -17,13 +17,14 @@
     ResourceExistsError,
     ResourceNotFoundError,
     ResourceNotModifiedError,
+    StreamClosedError,
+    StreamConsumedError,
     map_error,
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
 from azure.core.polling import LROPoller, NoPolling, PollingMethod
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
@@ -31,12 +32,11 @@
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -649,7 +649,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-09-01"))
         cls: ClsType[_models.ListContainerItems] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -671,7 +671,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -687,7 +686,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -822,7 +820,7 @@ def create(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -857,7 +855,6 @@ def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -871,11 +868,7 @@ def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("BlobContainer", pipeline_response)
-
-        if response.status_code == 201:
-            deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -985,7 +978,7 @@ def update(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1020,7 +1013,6 @@ def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1034,7 +1026,7 @@ def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1063,7 +1055,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1086,7 +1078,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1100,7 +1091,7 @@ def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1129,7 +1120,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,
@@ -1152,7 +1143,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1275,7 +1265,7 @@ def set_legal_hold(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.LegalHold
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1310,7 +1300,6 @@ def set_legal_hold(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1324,7 +1313,7 @@ def set_legal_hold(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LegalHold", pipeline_response)
+        deserialized = self._deserialize("LegalHold", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1434,7 +1423,7 @@ def clear_legal_hold(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.LegalHold
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1469,7 +1458,6 @@ def clear_legal_hold(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1483,7 +1471,7 @@ def clear_legal_hold(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LegalHold", pipeline_response)
+        deserialized = self._deserialize("LegalHold", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1610,7 +1598,7 @@ def create_or_update_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1651,7 +1639,6 @@ def create_or_update_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1668,7 +1655,7 @@ def create_or_update_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1707,7 +1694,7 @@ def get_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1733,7 +1720,6 @@ def get_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1750,7 +1736,7 @@ def get_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1786,7 +1772,7 @@ def delete_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1812,7 +1798,6 @@ def delete_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1829,7 +1814,7 @@ def delete_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1863,7 +1848,7 @@ def lock_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1887,7 +1872,6 @@ def lock_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1904,7 +1888,7 @@ def lock_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -2034,7 +2018,7 @@ def extend_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -2073,7 +2057,6 @@ def extend_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -2090,7 +2073,7 @@ def extend_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -2200,7 +2183,7 @@ def lease(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.LeaseContainerResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -2238,7 +2221,6 @@ def lease(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -2252,17 +2234,17 @@ def lease(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LeaseContainerResponse", pipeline_response)
+        deserialized = self._deserialize("LeaseContainerResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
 
         return deserialized  # type: ignore
 
-    def _object_level_worm_initial(  # pylint: disable=inconsistent-return-statements
+    def _object_level_worm_initial(
         self, resource_group_name: str, account_name: str, container_name: str, **kwargs: Any
-    ) -> None:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> Iterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -2274,7 +2256,7 @@ def _object_level_worm_initial(  # pylint: disable=inconsistent-return-statement
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-09-01"))
-        cls: ClsType[None] = kwargs.pop("cls", None)
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
 
         _request = build_object_level_worm_request(
             resource_group_name=resource_group_name,
@@ -2285,10 +2267,10 @@ def _object_level_worm_initial(  # pylint: disable=inconsistent-return-statement
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -2296,11 +2278,19 @@ def _object_level_worm_initial(  # pylint: disable=inconsistent-return-statement
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
-            return cls(pipeline_response, None, {})  # type: ignore
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
 
     @distributed_trace
     def begin_object_level_worm(
@@ -2336,7 +2326,7 @@ def begin_object_level_worm(
         lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
         cont_token: Optional[str] = kwargs.pop("continuation_token", None)
         if cont_token is None:
-            raw_result = self._object_level_worm_initial(  # type: ignore
+            raw_result = self._object_level_worm_initial(
                 resource_group_name=resource_group_name,
                 account_name=account_name,
                 container_name=container_name,
@@ -2346,6 +2336,7 @@ def begin_object_level_worm(
                 params=_params,
                 **kwargs
             )
+            raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/operations/_blob_inventory_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/operations/_blob_inventory_policies_operations.py
index dd313590bfa7..58f52c374197 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/operations/_blob_inventory_policies_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/operations/_blob_inventory_policies_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 (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -235,7 +232,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.BlobInventoryPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -258,7 +255,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -272,7 +268,7 @@ def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response)
+        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -376,7 +372,7 @@ def create_or_update(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.BlobInventoryPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -411,7 +407,6 @@ def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -425,7 +420,7 @@ def create_or_update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response)
+        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -457,7 +452,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,
@@ -480,7 +475,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -521,7 +515,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-09-01"))
         cls: ClsType[_models.ListBlobInventoryPolicy] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -540,7 +534,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -556,7 +549,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/operations/_blob_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/operations/_blob_services_operations.py
index 042cec48e32f..842d55c5617d 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/operations/_blob_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/operations/_blob_services_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, Literal, Optional, Type, TypeVar, Union, overload
+from typing import Any, Callable, Dict, IO, Iterable, Literal, Optional, TypeVar, Union, overload
 import urllib.parse
 
 from azure.core.exceptions import (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -191,7 +188,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-09-01"))
         cls: ClsType[_models.BlobServiceItems] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -210,7 +207,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -226,7 +222,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -343,7 +338,7 @@ def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.BlobServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -379,7 +374,6 @@ def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -393,7 +387,7 @@ def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobServiceProperties", pipeline_response)
+        deserialized = self._deserialize("BlobServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -418,7 +412,7 @@ def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.BlobServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -442,7 +436,6 @@ def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -456,7 +449,7 @@ def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobServiceProperties", pipeline_response)
+        deserialized = self._deserialize("BlobServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/operations/_deleted_accounts_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/operations/_deleted_accounts_operations.py
index 69b5cf3ff3be..32c663377e4c 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/operations/_deleted_accounts_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/operations/_deleted_accounts_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 (
@@ -20,20 +19,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -130,7 +127,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.DeletedAccount"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-09-01"))
         cls: ClsType[_models.DeletedAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -147,7 +144,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -163,7 +159,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -205,7 +200,7 @@ def get(self, deleted_account_name: str, location: str, **kwargs: Any) -> _model
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.DeletedAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -227,7 +222,6 @@ def get(self, deleted_account_name: str, location: str, **kwargs: Any) -> _model
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -242,7 +236,7 @@ def get(self, deleted_account_name: str, location: str, **kwargs: Any) -> _model
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("DeletedAccount", pipeline_response)
+        deserialized = self._deserialize("DeletedAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/operations/_encryption_scopes_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/operations/_encryption_scopes_operations.py
index e13665d292d8..b8454f161d8f 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/operations/_encryption_scopes_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/operations/_encryption_scopes_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 (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -315,7 +312,7 @@ def put(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.EncryptionScope
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -350,7 +347,6 @@ def put(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -365,11 +361,7 @@ def put(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("EncryptionScope", pipeline_response)
-
-        if response.status_code == 201:
-            deserialized = self._deserialize("EncryptionScope", pipeline_response)
+        deserialized = self._deserialize("EncryptionScope", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -479,7 +471,7 @@ def patch(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.EncryptionScope
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -514,7 +506,6 @@ def patch(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -529,7 +520,7 @@ def patch(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("EncryptionScope", pipeline_response)
+        deserialized = self._deserialize("EncryptionScope", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -558,7 +549,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.EncryptionScope
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -581,7 +572,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -596,7 +586,7 @@ def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("EncryptionScope", pipeline_response)
+        deserialized = self._deserialize("EncryptionScope", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -624,7 +614,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> It
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-09-01"))
         cls: ClsType[_models.EncryptionScopeListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -643,7 +633,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -659,7 +648,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/operations/_file_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/operations/_file_services_operations.py
index f6259ae9f886..41797abdc392 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/operations/_file_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/operations/_file_services_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, Literal, Optional, Type, TypeVar, Union, overload
+from typing import Any, Callable, Dict, IO, Literal, Optional, TypeVar, Union, overload
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -19,20 +18,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -179,7 +176,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.FileServiceItems
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -201,7 +198,6 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -215,7 +211,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileServiceItems", pipeline_response)
+        deserialized = self._deserialize("FileServiceItems", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -310,7 +306,7 @@ def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.FileServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -346,7 +342,6 @@ def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -360,7 +355,7 @@ def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileServiceProperties", pipeline_response)
+        deserialized = self._deserialize("FileServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -385,7 +380,7 @@ def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.FileServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -409,7 +404,6 @@ def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -423,7 +417,7 @@ def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileServiceProperties", pipeline_response)
+        deserialized = self._deserialize("FileServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/operations/_file_shares_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/operations/_file_shares_operations.py
index 3a98c6c29da1..71298a25c7be 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/operations/_file_shares_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/operations/_file_shares_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,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 (
@@ -21,20 +21,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -401,7 +399,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-09-01"))
         cls: ClsType[_models.FileShareItems] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -423,7 +421,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -439,7 +436,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -586,7 +582,7 @@ def create(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.FileShare
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -622,7 +618,6 @@ def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -636,11 +631,7 @@ def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("FileShare", pipeline_response)
-
-        if response.status_code == 201:
-            deserialized = self._deserialize("FileShare", pipeline_response)
+        deserialized = self._deserialize("FileShare", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -750,7 +741,7 @@ def update(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.FileShare
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -785,7 +776,6 @@ def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -799,7 +789,7 @@ def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileShare", pipeline_response)
+        deserialized = self._deserialize("FileShare", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -840,7 +830,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.FileShare
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -865,7 +855,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -879,7 +868,7 @@ def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileShare", pipeline_response)
+        deserialized = self._deserialize("FileShare", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -924,7 +913,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,
@@ -949,7 +938,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -967,7 +955,7 @@ def delete(  # pylint: disable=inconsistent-return-statements
             return cls(pipeline_response, None, {})  # type: ignore
 
     @overload
-    def restore(  # pylint: disable=inconsistent-return-statements
+    def restore(
         self,
         resource_group_name: str,
         account_name: str,
@@ -1002,7 +990,7 @@ def restore(  # pylint: disable=inconsistent-return-statements
         """
 
     @overload
-    def restore(  # pylint: disable=inconsistent-return-statements
+    def restore(
         self,
         resource_group_name: str,
         account_name: str,
@@ -1065,7 +1053,7 @@ def restore(  # 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,
@@ -1100,7 +1088,6 @@ def restore(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1232,7 +1219,7 @@ def lease(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.LeaseShareResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1271,7 +1258,6 @@ def lease(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1288,7 +1274,7 @@ def lease(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("LeaseShareResponse", pipeline_response)
+        deserialized = self._deserialize("LeaseShareResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/operations/_local_users_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/operations/_local_users_operations.py
index a5150ccb44d4..842b929bc66d 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/operations/_local_users_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/operations/_local_users_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 (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -287,7 +284,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> It
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-09-01"))
         cls: ClsType[_models.LocalUsers] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -306,7 +303,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -322,7 +318,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -370,7 +365,7 @@ def get(self, resource_group_name: str, account_name: str, username: str, **kwar
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.LocalUser
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -393,7 +388,6 @@ def get(self, resource_group_name: str, account_name: str, username: str, **kwar
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -408,7 +402,7 @@ def get(self, resource_group_name: str, account_name: str, username: str, **kwar
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LocalUser", pipeline_response)
+        deserialized = self._deserialize("LocalUser", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -509,7 +503,7 @@ def create_or_update(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.LocalUser
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -544,7 +538,6 @@ def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -559,7 +552,7 @@ def create_or_update(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LocalUser", pipeline_response)
+        deserialized = self._deserialize("LocalUser", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -586,7 +579,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,
@@ -609,7 +602,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -647,7 +639,7 @@ def list_keys(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.LocalUserKeys
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -670,7 +662,6 @@ def list_keys(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -685,7 +676,7 @@ def list_keys(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LocalUserKeys", pipeline_response)
+        deserialized = self._deserialize("LocalUserKeys", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -712,7 +703,7 @@ def regenerate_password(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.LocalUserRegeneratePasswordResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -735,7 +726,6 @@ def regenerate_password(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -750,7 +740,7 @@ def regenerate_password(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LocalUserRegeneratePasswordResult", pipeline_response)
+        deserialized = self._deserialize("LocalUserRegeneratePasswordResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/operations/_management_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/operations/_management_policies_operations.py
index 3cf3485ef2c2..de7cb5188f6d 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/operations/_management_policies_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/operations/_management_policies_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,
@@ -19,20 +18,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -196,7 +193,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.ManagementPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -219,7 +216,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -233,7 +229,7 @@ def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ManagementPolicy", pipeline_response)
+        deserialized = self._deserialize("ManagementPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -337,7 +333,7 @@ def create_or_update(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.ManagementPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -372,7 +368,6 @@ def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -386,7 +381,7 @@ def create_or_update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ManagementPolicy", pipeline_response)
+        deserialized = self._deserialize("ManagementPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -418,7 +413,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,
@@ -441,7 +436,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/operations/_object_replication_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/operations/_object_replication_policies_operations.py
index d8a7f992fac5..c210d54e0712 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/operations/_object_replication_policies_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/operations/_object_replication_policies_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 (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -229,7 +226,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-09-01"))
         cls: ClsType[_models.ObjectReplicationPolicies] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -248,7 +245,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -264,7 +260,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -316,7 +311,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.ObjectReplicationPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -339,7 +334,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -354,7 +348,7 @@ def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response)
+        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -464,7 +458,7 @@ def create_or_update(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.ObjectReplicationPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -499,7 +493,6 @@ def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -514,7 +507,7 @@ def create_or_update(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response)
+        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -543,7 +536,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,
@@ -566,7 +559,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/operations/_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/operations/_operations.py
index 4ad3304f8b20..9cdc119e7e74 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/operations/_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/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 (
@@ -20,20 +19,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -94,7 +91,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.Operation"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-09-01"))
         cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -110,7 +107,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -126,7 +122,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/operations/_private_endpoint_connections_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/operations/_private_endpoint_connections_operations.py
index 0e2d96ed4a36..97ef96351437 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/operations/_private_endpoint_connections_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/operations/_private_endpoint_connections_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 (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -241,7 +238,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-09-01"))
         cls: ClsType[_models.PrivateEndpointConnectionListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -260,7 +257,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -276,7 +272,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -325,7 +320,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.PrivateEndpointConnection
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -348,7 +343,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -363,7 +357,7 @@ def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response)
+        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -464,7 +458,7 @@ def put(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.PrivateEndpointConnection
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -499,7 +493,6 @@ def put(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -514,7 +507,7 @@ def put(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response)
+        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -541,7 +534,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,
@@ -564,7 +557,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/operations/_private_link_resources_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/operations/_private_link_resources_operations.py
index 0bf85a44dfdb..4fe9998a913d 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/operations/_private_link_resources_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/operations/_private_link_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, Optional, Type, TypeVar
+from typing import Any, Callable, Dict, Optional, TypeVar
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -18,20 +17,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -109,7 +106,7 @@ def list_by_storage_account(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.PrivateLinkResourceListResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -131,7 +128,6 @@ def list_by_storage_account(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -145,7 +141,7 @@ def list_by_storage_account(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("PrivateLinkResourceListResult", pipeline_response)
+        deserialized = self._deserialize("PrivateLinkResourceListResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/operations/_queue_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/operations/_queue_operations.py
index 10ce809484c5..95e1c9d46e7f 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/operations/_queue_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/operations/_queue_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 (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -375,7 +372,7 @@ def create(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.StorageQueue
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -410,7 +407,6 @@ def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -424,7 +420,7 @@ def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageQueue", pipeline_response)
+        deserialized = self._deserialize("StorageQueue", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -531,7 +527,7 @@ def update(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.StorageQueue
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -566,7 +562,6 @@ def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -580,7 +575,7 @@ def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageQueue", pipeline_response)
+        deserialized = self._deserialize("StorageQueue", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -607,7 +602,7 @@ def get(self, resource_group_name: str, account_name: str, queue_name: str, **kw
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.StorageQueue
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -630,7 +625,6 @@ def get(self, resource_group_name: str, account_name: str, queue_name: str, **kw
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -644,7 +638,7 @@ def get(self, resource_group_name: str, account_name: str, queue_name: str, **kw
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageQueue", pipeline_response)
+        deserialized = self._deserialize("StorageQueue", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -673,7 +667,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,
@@ -696,7 +690,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -747,7 +740,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-09-01"))
         cls: ClsType[_models.ListQueueResource] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -768,7 +761,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -784,7 +776,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/operations/_queue_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/operations/_queue_services_operations.py
index 33f4e71e780a..a4e854aad0e6 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/operations/_queue_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/operations/_queue_services_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, Literal, Optional, Type, TypeVar, Union, overload
+from typing import Any, Callable, Dict, IO, Literal, Optional, TypeVar, Union, overload
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -19,20 +18,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -179,7 +176,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.ListQueueServices
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -201,7 +198,6 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -215,7 +211,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListQueueServices", pipeline_response)
+        deserialized = self._deserialize("ListQueueServices", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -310,7 +306,7 @@ def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.QueueServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -346,7 +342,6 @@ def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -360,7 +355,7 @@ def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("QueueServiceProperties", pipeline_response)
+        deserialized = self._deserialize("QueueServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -385,7 +380,7 @@ def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.QueueServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -409,7 +404,6 @@ def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -423,7 +417,7 @@ def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("QueueServiceProperties", pipeline_response)
+        deserialized = self._deserialize("QueueServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/operations/_skus_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/operations/_skus_operations.py
index 8fc4602cd48e..6703981a69dd 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/operations/_skus_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/operations/_skus_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 (
@@ -20,20 +19,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -99,7 +96,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.SkuInformation"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-09-01"))
         cls: ClsType[_models.StorageSkuListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -116,7 +113,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -132,7 +128,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/operations/_storage_accounts_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/operations/_storage_accounts_operations.py
index 112c1a494053..4913a6e35002 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/operations/_storage_accounts_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/operations/_storage_accounts_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,7 @@
 # --------------------------------------------------------------------------
 from io import IOBase
 import sys
-from typing import Any, Callable, Dict, IO, Iterable, Literal, Optional, Type, TypeVar, Union, cast, overload
+from typing import Any, Callable, Dict, IO, Iterable, Iterator, Literal, Optional, TypeVar, Union, cast, overload
 import urllib.parse
 
 from azure.core.exceptions import (
@@ -17,13 +17,14 @@
     ResourceExistsError,
     ResourceNotFoundError,
     ResourceNotModifiedError,
+    StreamClosedError,
+    StreamConsumedError,
     map_error,
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
 from azure.core.polling import LROPoller, NoPolling, PollingMethod
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
@@ -31,12 +32,11 @@
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -649,7 +649,7 @@ def check_name_availability(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.CheckNameAvailabilityResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -681,7 +681,6 @@ def check_name_availability(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -695,7 +694,7 @@ def check_name_availability(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response)
+        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -708,8 +707,8 @@ def _create_initial(
         account_name: str,
         parameters: Union[_models.StorageAccountCreateParameters, IO[bytes]],
         **kwargs: Any
-    ) -> Optional[_models.StorageAccount]:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> Iterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -722,7 +721,7 @@ def _create_initial(
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-09-01"))
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
-        cls: ClsType[Optional[_models.StorageAccount]] = kwargs.pop("cls", None)
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
         _json = None
@@ -743,10 +742,10 @@ def _create_initial(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -754,12 +753,14 @@ def _create_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = None
-        if response.status_code == 200:
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -882,10 +883,11 @@ def begin_create(
                 params=_params,
                 **kwargs
             )
+            raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+            deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
             if cls:
                 return cls(pipeline_response, deserialized, {})  # type: ignore
             return deserialized
@@ -924,7 +926,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,
@@ -946,7 +948,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -991,7 +992,7 @@ def get_properties(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1014,7 +1015,6 @@ def get_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1028,7 +1028,7 @@ def get_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1139,7 +1139,7 @@ def update(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1173,7 +1173,6 @@ def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1187,7 +1186,7 @@ def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1209,7 +1208,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.StorageAccount"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-09-01"))
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1226,7 +1225,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -1242,7 +1240,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -1289,7 +1286,7 @@ def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> Ite
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-09-01"))
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1307,7 +1304,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -1323,7 +1319,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -1373,7 +1368,7 @@ def list_keys(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.StorageAccountListKeysResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1396,7 +1391,6 @@ def list_keys(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1410,7 +1404,7 @@ def list_keys(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response)
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1504,7 +1498,7 @@ def regenerate_key(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.StorageAccountListKeysResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1538,7 +1532,6 @@ def regenerate_key(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1552,7 +1545,7 @@ def regenerate_key(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response)
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1643,7 +1636,7 @@ def list_account_sas(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.ListAccountSasResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1677,7 +1670,6 @@ def list_account_sas(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1691,7 +1683,7 @@ def list_account_sas(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListAccountSasResponse", pipeline_response)
+        deserialized = self._deserialize("ListAccountSasResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1780,7 +1772,7 @@ def list_service_sas(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.ListServiceSasResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1814,7 +1806,6 @@ def list_service_sas(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1828,17 +1819,15 @@ def list_service_sas(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListServiceSasResponse", pipeline_response)
+        deserialized = self._deserialize("ListServiceSasResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
 
         return deserialized  # type: ignore
 
-    def _failover_initial(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, **kwargs: Any
-    ) -> None:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    def _failover_initial(self, resource_group_name: str, account_name: str, **kwargs: Any) -> Iterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1850,7 +1839,7 @@ def _failover_initial(  # pylint: disable=inconsistent-return-statements
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-09-01"))
-        cls: ClsType[None] = kwargs.pop("cls", None)
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
 
         _request = build_failover_request(
             resource_group_name=resource_group_name,
@@ -1860,10 +1849,10 @@ def _failover_initial(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -1871,11 +1860,19 @@ def _failover_initial(  # pylint: disable=inconsistent-return-statements
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
-            return cls(pipeline_response, None, {})  # type: ignore
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
 
     @distributed_trace
     def begin_failover(self, resource_group_name: str, account_name: str, **kwargs: Any) -> LROPoller[None]:
@@ -1903,7 +1900,7 @@ def begin_failover(self, resource_group_name: str, account_name: str, **kwargs:
         lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
         cont_token: Optional[str] = kwargs.pop("continuation_token", None)
         if cont_token is None:
-            raw_result = self._failover_initial(  # type: ignore
+            raw_result = self._failover_initial(
                 resource_group_name=resource_group_name,
                 account_name=account_name,
                 api_version=api_version,
@@ -1912,6 +1909,7 @@ def begin_failover(self, resource_group_name: str, account_name: str, **kwargs:
                 params=_params,
                 **kwargs
             )
+            raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
@@ -1935,10 +1933,10 @@ def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-
             )
         return LROPoller[None](self._client, raw_result, get_long_running_output, polling_method)  # type: ignore
 
-    def _hierarchical_namespace_migration_initial(  # pylint: disable=inconsistent-return-statements,name-too-long
+    def _hierarchical_namespace_migration_initial(  # pylint: disable=name-too-long
         self, resource_group_name: str, account_name: str, request_type: str, **kwargs: Any
-    ) -> None:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> Iterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1950,7 +1948,7 @@ def _hierarchical_namespace_migration_initial(  # pylint: disable=inconsistent-r
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-09-01"))
-        cls: ClsType[None] = kwargs.pop("cls", None)
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
 
         _request = build_hierarchical_namespace_migration_request(
             resource_group_name=resource_group_name,
@@ -1961,10 +1959,10 @@ def _hierarchical_namespace_migration_initial(  # pylint: disable=inconsistent-r
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -1972,12 +1970,20 @@ def _hierarchical_namespace_migration_initial(  # pylint: disable=inconsistent-r
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
-            return cls(pipeline_response, None, {})  # type: ignore
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
 
     @distributed_trace
     def begin_hierarchical_namespace_migration(
@@ -2010,7 +2016,7 @@ def begin_hierarchical_namespace_migration(
         lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
         cont_token: Optional[str] = kwargs.pop("continuation_token", None)
         if cont_token is None:
-            raw_result = self._hierarchical_namespace_migration_initial(  # type: ignore
+            raw_result = self._hierarchical_namespace_migration_initial(
                 resource_group_name=resource_group_name,
                 account_name=account_name,
                 request_type=request_type,
@@ -2020,6 +2026,7 @@ def begin_hierarchical_namespace_migration(
                 params=_params,
                 **kwargs
             )
+            raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
@@ -2043,10 +2050,10 @@ def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-
             )
         return LROPoller[None](self._client, raw_result, get_long_running_output, polling_method)  # type: ignore
 
-    def _abort_hierarchical_namespace_migration_initial(  # pylint: disable=inconsistent-return-statements,name-too-long
+    def _abort_hierarchical_namespace_migration_initial(  # pylint: disable=name-too-long
         self, resource_group_name: str, account_name: str, **kwargs: Any
-    ) -> None:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> Iterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -2058,7 +2065,7 @@ def _abort_hierarchical_namespace_migration_initial(  # pylint: disable=inconsis
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-09-01"))
-        cls: ClsType[None] = kwargs.pop("cls", None)
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
 
         _request = build_abort_hierarchical_namespace_migration_request(
             resource_group_name=resource_group_name,
@@ -2068,10 +2075,10 @@ def _abort_hierarchical_namespace_migration_initial(  # pylint: disable=inconsis
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -2079,12 +2086,20 @@ def _abort_hierarchical_namespace_migration_initial(  # pylint: disable=inconsis
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
-            return cls(pipeline_response, None, {})  # type: ignore
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
 
     @distributed_trace
     def begin_abort_hierarchical_namespace_migration(  # pylint: disable=name-too-long
@@ -2112,7 +2127,7 @@ def begin_abort_hierarchical_namespace_migration(  # pylint: disable=name-too-lo
         lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
         cont_token: Optional[str] = kwargs.pop("continuation_token", None)
         if cont_token is None:
-            raw_result = self._abort_hierarchical_namespace_migration_initial(  # type: ignore
+            raw_result = self._abort_hierarchical_namespace_migration_initial(
                 resource_group_name=resource_group_name,
                 account_name=account_name,
                 api_version=api_version,
@@ -2121,6 +2136,7 @@ def begin_abort_hierarchical_namespace_migration(  # pylint: disable=name-too-lo
                 params=_params,
                 **kwargs
             )
+            raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
@@ -2150,8 +2166,8 @@ def _restore_blob_ranges_initial(
         account_name: str,
         parameters: Union[_models.BlobRestoreParameters, IO[bytes]],
         **kwargs: Any
-    ) -> _models.BlobRestoreStatus:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> Iterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -2164,7 +2180,7 @@ def _restore_blob_ranges_initial(
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-09-01"))
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
-        cls: ClsType[_models.BlobRestoreStatus] = kwargs.pop("cls", None)
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
         _json = None
@@ -2185,10 +2201,10 @@ def _restore_blob_ranges_initial(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -2196,14 +2212,14 @@ def _restore_blob_ranges_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response)
-
-        if response.status_code == 202:
-            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response)
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -2316,10 +2332,11 @@ def begin_restore_blob_ranges(
                 params=_params,
                 **kwargs
             )
+            raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):
-            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response)
+            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response.http_response)
             if cls:
                 return cls(pipeline_response, deserialized, {})  # type: ignore
             return deserialized
@@ -2360,7 +2377,7 @@ def revoke_user_delegation_keys(  # pylint: disable=inconsistent-return-statemen
         :rtype: None
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -2382,7 +2399,6 @@ def revoke_user_delegation_keys(  # pylint: disable=inconsistent-return-statemen
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/operations/_table_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/operations/_table_operations.py
index 56741a11ca37..60bf1fafd4c9 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/operations/_table_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/operations/_table_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 (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -340,7 +337,7 @@ def create(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.Table
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -378,7 +375,6 @@ def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -392,7 +388,7 @@ def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("Table", pipeline_response)
+        deserialized = self._deserialize("Table", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -496,7 +492,7 @@ def update(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.Table
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -534,7 +530,6 @@ def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -548,7 +543,7 @@ def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("Table", pipeline_response)
+        deserialized = self._deserialize("Table", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -574,7 +569,7 @@ def get(self, resource_group_name: str, account_name: str, table_name: str, **kw
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.Table
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -597,7 +592,6 @@ def get(self, resource_group_name: str, account_name: str, table_name: str, **kw
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -611,7 +605,7 @@ def get(self, resource_group_name: str, account_name: str, table_name: str, **kw
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("Table", pipeline_response)
+        deserialized = self._deserialize("Table", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -639,7 +633,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,
@@ -662,7 +656,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -700,7 +693,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> It
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-09-01"))
         cls: ClsType[_models.ListTableResource] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -719,7 +712,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -735,7 +727,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/operations/_table_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/operations/_table_services_operations.py
index 9816b0dd3178..3b7ca8341cb1 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/operations/_table_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/operations/_table_services_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, Literal, Optional, Type, TypeVar, Union, overload
+from typing import Any, Callable, Dict, IO, Literal, Optional, TypeVar, Union, overload
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -19,20 +18,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -179,7 +176,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.ListTableServices
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -201,7 +198,6 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -215,7 +211,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListTableServices", pipeline_response)
+        deserialized = self._deserialize("ListTableServices", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -310,7 +306,7 @@ def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.TableServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -346,7 +342,6 @@ def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -360,7 +355,7 @@ def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("TableServiceProperties", pipeline_response)
+        deserialized = self._deserialize("TableServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -385,7 +380,7 @@ def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2021_09_01.models.TableServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -409,7 +404,6 @@ def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -423,7 +417,7 @@ def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("TableServiceProperties", pipeline_response)
+        deserialized = self._deserialize("TableServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/operations/_usages_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/operations/_usages_operations.py
index 5e4e909bde19..3d10c2e7058f 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/operations/_usages_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2021_09_01/operations/_usages_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 (
@@ -20,20 +19,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -105,7 +102,7 @@ def list_by_location(self, location: str, **kwargs: Any) -> Iterable["_models.Us
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2021-09-01"))
         cls: ClsType[_models.UsageListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -123,7 +120,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -139,7 +135,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/__init__.py
index a860a5c185c9..60980065e1ee 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/__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 ._storage_management_client import StorageManagementClient
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._storage_management_client import StorageManagementClient  # 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__ = [
     "StorageManagementClient",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/_configuration.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/_configuration.py
index f9bfd4854fd0..7316bb72f911 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/_configuration.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/_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 StorageManagementClientConfiguration:  # pylint: disable=too-many-instance-attributes,name-too-long
+class StorageManagementClientConfiguration:  # pylint: disable=too-many-instance-attributes
     """Configuration for StorageManagementClient.
 
     Note that all parameters used to create this instance are saved as instance
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/_metadata.json b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/_metadata.json
index 853cb69db687..b770cf897224 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/_metadata.json
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/_metadata.json
@@ -10,8 +10,8 @@
         "azure_arm": true,
         "has_public_lro_operations": true,
         "client_side_validation": false,
-        "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"ARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementClientConfiguration\"], \".._serialization\": [\"Deserializer\", \"Serializer\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}}",
-        "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"AsyncARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"AsyncARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementClientConfiguration\"], \"..._serialization\": [\"Deserializer\", \"Serializer\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"]}}}"
+        "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"ARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementClientConfiguration\"], \".._serialization\": [\"Deserializer\", \"Serializer\"]}, \"stdlib\": {\"typing_extensions\": [\"Self\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}}",
+        "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"AsyncARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"AsyncARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementClientConfiguration\"], \"..._serialization\": [\"Deserializer\", \"Serializer\"]}, \"stdlib\": {\"typing_extensions\": [\"Self\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"]}}}"
     },
     "global_parameters": {
         "sync": {
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/_storage_management_client.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/_storage_management_client.py
index cdeb4bbef0b5..5dfd90c0ee0a 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/_storage_management_client.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/_storage_management_client.py
@@ -8,6 +8,7 @@
 
 from copy import deepcopy
 from typing import Any, TYPE_CHECKING
+from typing_extensions import Self
 
 from azure.core.pipeline import policies
 from azure.core.rest import HttpRequest, HttpResponse
@@ -41,11 +42,10 @@
 )
 
 if TYPE_CHECKING:
-    # pylint: disable=unused-import,ungrouped-imports
     from azure.core.credentials import TokenCredential
 
 
-class StorageManagementClient:  # pylint: disable=client-accepts-api-version-keyword,too-many-instance-attributes
+class StorageManagementClient:  # pylint: disable=too-many-instance-attributes
     """The Azure Storage Management API.
 
     :ivar operations: Operations operations
@@ -217,7 +217,7 @@ def _send_request(self, request: HttpRequest, *, stream: bool = False, **kwargs:
     def close(self) -> None:
         self._client.close()
 
-    def __enter__(self) -> "StorageManagementClient":
+    def __enter__(self) -> Self:
         self._client.__enter__()
         return self
 
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/_vendor.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/_vendor.py
deleted file mode 100644
index 0dafe0e287ff..000000000000
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/_vendor.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# --------------------------------------------------------------------------
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License. See License.txt in the project root for license information.
-# Code generated by Microsoft (R) AutoRest Code Generator.
-# Changes may cause incorrect behavior and will be lost if the code is regenerated.
-# --------------------------------------------------------------------------
-
-from azure.core.pipeline.transport import HttpRequest
-
-
-def _convert_request(request, files=None):
-    data = request.content if not files else None
-    request = HttpRequest(method=request.method, url=request.url, headers=request.headers, data=data)
-    if files:
-        request.set_formdata_body(files)
-    return request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/_version.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/_version.py
index 5a163c0afedc..e5754a47ce68 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/_version.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/_version.py
@@ -6,4 +6,4 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-VERSION = "21.2.1"
\ No newline at end of file
+VERSION = "1.0.0b1"
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/__init__.py
index a5c3d2414cfd..ee2b940bd4fc 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/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 ._storage_management_client import StorageManagementClient
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._storage_management_client import StorageManagementClient  # 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__ = [
     "StorageManagementClient",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/_configuration.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/_configuration.py
index bc246da8db27..466dd0d44ebb 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/_configuration.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/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 StorageManagementClientConfiguration:  # pylint: disable=too-many-instance-attributes,name-too-long
+class StorageManagementClientConfiguration:  # pylint: disable=too-many-instance-attributes
     """Configuration for StorageManagementClient.
 
     Note that all parameters used to create this instance are saved as instance
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/_storage_management_client.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/_storage_management_client.py
index 990dfb884a7d..d6d1dc9b90bb 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/_storage_management_client.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/_storage_management_client.py
@@ -8,6 +8,7 @@
 
 from copy import deepcopy
 from typing import Any, Awaitable, TYPE_CHECKING
+from typing_extensions import Self
 
 from azure.core.pipeline import policies
 from azure.core.rest import AsyncHttpResponse, HttpRequest
@@ -41,11 +42,10 @@
 )
 
 if TYPE_CHECKING:
-    # pylint: disable=unused-import,ungrouped-imports
     from azure.core.credentials_async import AsyncTokenCredential
 
 
-class StorageManagementClient:  # pylint: disable=client-accepts-api-version-keyword,too-many-instance-attributes
+class StorageManagementClient:  # pylint: disable=too-many-instance-attributes
     """The Azure Storage Management API.
 
     :ivar operations: Operations operations
@@ -222,7 +222,7 @@ def _send_request(
     async def close(self) -> None:
         await self._client.close()
 
-    async def __aenter__(self) -> "StorageManagementClient":
+    async def __aenter__(self) -> Self:
         await self._client.__aenter__()
         return self
 
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/operations/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/operations/__init__.py
index bbce85749d18..a0549517e087 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/operations/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/operations/__init__.py
@@ -5,30 +5,36 @@
 # 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 ._skus_operations import SkusOperations
-from ._storage_accounts_operations import StorageAccountsOperations
-from ._deleted_accounts_operations import DeletedAccountsOperations
-from ._usages_operations import UsagesOperations
-from ._management_policies_operations import ManagementPoliciesOperations
-from ._blob_inventory_policies_operations import BlobInventoryPoliciesOperations
-from ._private_endpoint_connections_operations import PrivateEndpointConnectionsOperations
-from ._private_link_resources_operations import PrivateLinkResourcesOperations
-from ._object_replication_policies_operations import ObjectReplicationPoliciesOperations
-from ._local_users_operations import LocalUsersOperations
-from ._encryption_scopes_operations import EncryptionScopesOperations
-from ._blob_services_operations import BlobServicesOperations
-from ._blob_containers_operations import BlobContainersOperations
-from ._file_services_operations import FileServicesOperations
-from ._file_shares_operations import FileSharesOperations
-from ._queue_services_operations import QueueServicesOperations
-from ._queue_operations import QueueOperations
-from ._table_services_operations import TableServicesOperations
-from ._table_operations import TableOperations
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._operations import Operations  # type: ignore
+from ._skus_operations import SkusOperations  # type: ignore
+from ._storage_accounts_operations import StorageAccountsOperations  # type: ignore
+from ._deleted_accounts_operations import DeletedAccountsOperations  # type: ignore
+from ._usages_operations import UsagesOperations  # type: ignore
+from ._management_policies_operations import ManagementPoliciesOperations  # type: ignore
+from ._blob_inventory_policies_operations import BlobInventoryPoliciesOperations  # type: ignore
+from ._private_endpoint_connections_operations import PrivateEndpointConnectionsOperations  # type: ignore
+from ._private_link_resources_operations import PrivateLinkResourcesOperations  # type: ignore
+from ._object_replication_policies_operations import ObjectReplicationPoliciesOperations  # type: ignore
+from ._local_users_operations import LocalUsersOperations  # type: ignore
+from ._encryption_scopes_operations import EncryptionScopesOperations  # type: ignore
+from ._blob_services_operations import BlobServicesOperations  # type: ignore
+from ._blob_containers_operations import BlobContainersOperations  # type: ignore
+from ._file_services_operations import FileServicesOperations  # type: ignore
+from ._file_shares_operations import FileSharesOperations  # type: ignore
+from ._queue_services_operations import QueueServicesOperations  # type: ignore
+from ._queue_operations import QueueOperations  # type: ignore
+from ._table_services_operations import TableServicesOperations  # type: ignore
+from ._table_operations import TableOperations  # 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__ = [
@@ -53,5 +59,5 @@
     "TableServicesOperations",
     "TableOperations",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/operations/_blob_containers_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/operations/_blob_containers_operations.py
index ad39f21eb91d..09a4a8ee81a0 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/operations/_blob_containers_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/operations/_blob_containers_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,20 @@
 # --------------------------------------------------------------------------
 from io import IOBase
 import sys
-from typing import Any, AsyncIterable, Callable, Dict, IO, Literal, Optional, Type, TypeVar, Union, cast, overload
+from typing import (
+    Any,
+    AsyncIterable,
+    AsyncIterator,
+    Callable,
+    Dict,
+    IO,
+    Literal,
+    Optional,
+    TypeVar,
+    Union,
+    cast,
+    overload,
+)
 import urllib.parse
 
 from azure.core.async_paging import AsyncItemPaged, AsyncList
@@ -18,12 +31,13 @@
     ResourceExistsError,
     ResourceNotFoundError,
     ResourceNotModifiedError,
+    StreamClosedError,
+    StreamConsumedError,
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
 from azure.core.polling import AsyncLROPoller, AsyncNoPolling, AsyncPollingMethod
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
@@ -31,7 +45,6 @@
 from azure.mgmt.core.polling.async_arm_polling import AsyncARMPolling
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._blob_containers_operations import (
     build_clear_legal_hold_request,
     build_create_or_update_immutability_policy_request,
@@ -52,7 +65,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]]
 
@@ -117,7 +130,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-05-01"))
         cls: ClsType[_models.ListContainerItems] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -139,7 +152,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -155,7 +167,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -290,7 +301,7 @@ async def create(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -325,7 +336,6 @@ async def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -339,11 +349,7 @@ async def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("BlobContainer", pipeline_response)
-
-        if response.status_code == 201:
-            deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -453,7 +459,7 @@ async def update(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -488,7 +494,6 @@ async def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -502,7 +507,7 @@ async def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -531,7 +536,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -554,7 +559,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -568,7 +572,7 @@ async def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -576,9 +580,7 @@ async def get(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, container_name: str, **kwargs: Any
-    ) -> None:
+    async def delete(self, resource_group_name: str, account_name: str, container_name: str, **kwargs: Any) -> None:
         """Deletes specified container under its account.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -597,7 +599,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,
@@ -620,7 +622,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -743,7 +744,7 @@ async def set_legal_hold(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.LegalHold
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -778,7 +779,6 @@ async def set_legal_hold(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -792,7 +792,7 @@ async def set_legal_hold(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LegalHold", pipeline_response)
+        deserialized = self._deserialize("LegalHold", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -902,7 +902,7 @@ async def clear_legal_hold(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.LegalHold
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -937,7 +937,6 @@ async def clear_legal_hold(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -951,7 +950,7 @@ async def clear_legal_hold(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LegalHold", pipeline_response)
+        deserialized = self._deserialize("LegalHold", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1078,7 +1077,7 @@ async def create_or_update_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1119,7 +1118,6 @@ async def create_or_update_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1136,7 +1134,7 @@ async def create_or_update_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1175,7 +1173,7 @@ async def get_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1201,7 +1199,6 @@ async def get_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1218,7 +1215,7 @@ async def get_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1254,7 +1251,7 @@ async def delete_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1280,7 +1277,6 @@ async def delete_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1297,7 +1293,7 @@ async def delete_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1331,7 +1327,7 @@ async def lock_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1355,7 +1351,6 @@ async def lock_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1372,7 +1367,7 @@ async def lock_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1502,7 +1497,7 @@ async def extend_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1541,7 +1536,6 @@ async def extend_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1558,7 +1552,7 @@ async def extend_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1668,7 +1662,7 @@ async def lease(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.LeaseContainerResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1706,7 +1700,6 @@ async def lease(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1720,17 +1713,17 @@ async def lease(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LeaseContainerResponse", pipeline_response)
+        deserialized = self._deserialize("LeaseContainerResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
 
         return deserialized  # type: ignore
 
-    async def _object_level_worm_initial(  # pylint: disable=inconsistent-return-statements
+    async def _object_level_worm_initial(
         self, resource_group_name: str, account_name: str, container_name: str, **kwargs: Any
-    ) -> None:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1742,7 +1735,7 @@ async def _object_level_worm_initial(  # pylint: disable=inconsistent-return-sta
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-05-01"))
-        cls: ClsType[None] = kwargs.pop("cls", None)
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
 
         _request = build_object_level_worm_request(
             resource_group_name=resource_group_name,
@@ -1753,10 +1746,10 @@ async def _object_level_worm_initial(  # pylint: disable=inconsistent-return-sta
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -1764,11 +1757,19 @@ async def _object_level_worm_initial(  # pylint: disable=inconsistent-return-sta
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
-            return cls(pipeline_response, None, {})  # type: ignore
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
 
     @distributed_trace_async
     async def begin_object_level_worm(
@@ -1804,7 +1805,7 @@ async def begin_object_level_worm(
         lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
         cont_token: Optional[str] = kwargs.pop("continuation_token", None)
         if cont_token is None:
-            raw_result = await self._object_level_worm_initial(  # type: ignore
+            raw_result = await self._object_level_worm_initial(
                 resource_group_name=resource_group_name,
                 account_name=account_name,
                 container_name=container_name,
@@ -1814,6 +1815,7 @@ async def begin_object_level_worm(
                 params=_params,
                 **kwargs
             )
+            await raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/operations/_blob_inventory_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/operations/_blob_inventory_policies_operations.py
index 9cec7838b2cf..c566e318aafd 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/operations/_blob_inventory_policies_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/operations/_blob_inventory_policies_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._blob_inventory_policies_operations import (
     build_create_or_update_request,
     build_delete_request,
@@ -40,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]]
 
@@ -90,7 +87,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.BlobInventoryPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -113,7 +110,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -127,7 +123,7 @@ async def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response)
+        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -231,7 +227,7 @@ async def create_or_update(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.BlobInventoryPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -266,7 +262,6 @@ async def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -280,7 +275,7 @@ async def create_or_update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response)
+        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -288,7 +283,7 @@ async def create_or_update(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
+    async def delete(
         self,
         resource_group_name: str,
         account_name: str,
@@ -312,7 +307,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,
@@ -335,7 +330,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -376,7 +370,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-05-01"))
         cls: ClsType[_models.ListBlobInventoryPolicy] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -395,7 +389,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -411,7 +404,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/operations/_blob_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/operations/_blob_services_operations.py
index b02a03c8a40e..11ba7631c4c4 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/operations/_blob_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/operations/_blob_services_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, Literal, Optional, Type, TypeVar, Union, overload
+from typing import Any, AsyncIterable, Callable, Dict, IO, Literal, Optional, TypeVar, Union, overload
 import urllib.parse
 
 from azure.core.async_paging import AsyncItemPaged, AsyncList
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._blob_services_operations import (
     build_get_service_properties_request,
     build_list_request,
@@ -39,7 +36,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 +86,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-05-01"))
         cls: ClsType[_models.BlobServiceItems] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -108,7 +105,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -124,7 +120,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -241,7 +236,7 @@ async def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.BlobServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -277,7 +272,6 @@ async def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -291,7 +285,7 @@ async def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobServiceProperties", pipeline_response)
+        deserialized = self._deserialize("BlobServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -316,7 +310,7 @@ async def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.BlobServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -340,7 +334,6 @@ async def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -354,7 +347,7 @@ async def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobServiceProperties", pipeline_response)
+        deserialized = self._deserialize("BlobServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/operations/_deleted_accounts_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/operations/_deleted_accounts_operations.py
index f4b18001f4d4..e4936a26ba2b 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/operations/_deleted_accounts_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/operations/_deleted_accounts_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
@@ -20,21 +19,19 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._deleted_accounts_operations import build_get_request, build_list_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
 
@@ -74,7 +71,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.DeletedAccount"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-05-01"))
         cls: ClsType[_models.DeletedAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -91,7 +88,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -107,7 +103,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -149,7 +144,7 @@ async def get(self, deleted_account_name: str, location: str, **kwargs: Any) ->
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.DeletedAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -171,7 +166,6 @@ async def get(self, deleted_account_name: str, location: str, **kwargs: Any) ->
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -186,7 +180,7 @@ async def get(self, deleted_account_name: str, location: str, **kwargs: Any) ->
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("DeletedAccount", pipeline_response)
+        deserialized = self._deserialize("DeletedAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/operations/_encryption_scopes_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/operations/_encryption_scopes_operations.py
index f1bd39ee6a26..6e20cb3028ca 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/operations/_encryption_scopes_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/operations/_encryption_scopes_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._encryption_scopes_operations import (
     build_get_request,
     build_list_request,
@@ -40,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]]
 
@@ -173,7 +170,7 @@ async def put(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.EncryptionScope
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -208,7 +205,6 @@ async def put(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -223,11 +219,7 @@ async def put(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("EncryptionScope", pipeline_response)
-
-        if response.status_code == 201:
-            deserialized = self._deserialize("EncryptionScope", pipeline_response)
+        deserialized = self._deserialize("EncryptionScope", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -337,7 +329,7 @@ async def patch(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.EncryptionScope
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -372,7 +364,6 @@ async def patch(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -387,7 +378,7 @@ async def patch(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("EncryptionScope", pipeline_response)
+        deserialized = self._deserialize("EncryptionScope", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -416,7 +407,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.EncryptionScope
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -439,7 +430,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -454,7 +444,7 @@ async def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("EncryptionScope", pipeline_response)
+        deserialized = self._deserialize("EncryptionScope", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -485,7 +475,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-05-01"))
         cls: ClsType[_models.EncryptionScopeListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -504,7 +494,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -520,7 +509,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/operations/_file_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/operations/_file_services_operations.py
index f144691d10a1..93b940cad88a 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/operations/_file_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/operations/_file_services_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, Literal, Optional, Type, TypeVar, Union, overload
+from typing import Any, Callable, Dict, IO, Literal, Optional, TypeVar, Union, overload
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -19,14 +18,12 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._file_services_operations import (
     build_get_service_properties_request,
     build_list_request,
@@ -36,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]]
 
@@ -76,7 +73,7 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.FileServiceItems
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -98,7 +95,6 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -112,7 +108,7 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileServiceItems", pipeline_response)
+        deserialized = self._deserialize("FileServiceItems", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -207,7 +203,7 @@ async def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.FileServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -243,7 +239,6 @@ async def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -257,7 +252,7 @@ async def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileServiceProperties", pipeline_response)
+        deserialized = self._deserialize("FileServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -282,7 +277,7 @@ async def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.FileServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -306,7 +301,6 @@ async def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -320,7 +314,7 @@ async def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileServiceProperties", pipeline_response)
+        deserialized = self._deserialize("FileServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/operations/_file_shares_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/operations/_file_shares_operations.py
index 3659cf6d0800..29dab3d980f5 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/operations/_file_shares_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/operations/_file_shares_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._file_shares_operations import (
     build_create_request,
     build_delete_request,
@@ -43,7 +40,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]]
 
@@ -108,7 +105,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-05-01"))
         cls: ClsType[_models.FileShareItems] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -130,7 +127,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -146,7 +142,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -293,7 +288,7 @@ async def create(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.FileShare
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -329,7 +324,6 @@ async def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -343,11 +337,7 @@ async def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("FileShare", pipeline_response)
-
-        if response.status_code == 201:
-            deserialized = self._deserialize("FileShare", pipeline_response)
+        deserialized = self._deserialize("FileShare", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -457,7 +447,7 @@ async def update(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.FileShare
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -492,7 +482,6 @@ async def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -506,7 +495,7 @@ async def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileShare", pipeline_response)
+        deserialized = self._deserialize("FileShare", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -547,7 +536,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.FileShare
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -572,7 +561,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -586,7 +574,7 @@ async def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileShare", pipeline_response)
+        deserialized = self._deserialize("FileShare", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -594,7 +582,7 @@ async def get(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
+    async def delete(
         self,
         resource_group_name: str,
         account_name: str,
@@ -631,7 +619,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,
@@ -656,7 +644,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -674,7 +661,7 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             return cls(pipeline_response, None, {})  # type: ignore
 
     @overload
-    async def restore(  # pylint: disable=inconsistent-return-statements
+    async def restore(
         self,
         resource_group_name: str,
         account_name: str,
@@ -709,7 +696,7 @@ async def restore(  # pylint: disable=inconsistent-return-statements
         """
 
     @overload
-    async def restore(  # pylint: disable=inconsistent-return-statements
+    async def restore(
         self,
         resource_group_name: str,
         account_name: str,
@@ -744,7 +731,7 @@ async def restore(  # pylint: disable=inconsistent-return-statements
         """
 
     @distributed_trace_async
-    async def restore(  # pylint: disable=inconsistent-return-statements
+    async def restore(
         self,
         resource_group_name: str,
         account_name: str,
@@ -772,7 +759,7 @@ async def restore(  # 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,
@@ -807,7 +794,6 @@ async def restore(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -939,7 +925,7 @@ async def lease(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.LeaseShareResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -978,7 +964,6 @@ async def lease(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -995,7 +980,7 @@ async def lease(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("LeaseShareResponse", pipeline_response)
+        deserialized = self._deserialize("LeaseShareResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/operations/_local_users_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/operations/_local_users_operations.py
index eeded3cc73cb..ffe8dcd63940 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/operations/_local_users_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/operations/_local_users_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._local_users_operations import (
     build_create_or_update_request,
     build_delete_request,
@@ -42,7 +39,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 +86,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> As
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-05-01"))
         cls: ClsType[_models.LocalUsers] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -108,7 +105,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -124,7 +120,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -172,7 +167,7 @@ async def get(self, resource_group_name: str, account_name: str, username: str,
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.LocalUser
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -195,7 +190,6 @@ async def get(self, resource_group_name: str, account_name: str, username: str,
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -210,7 +204,7 @@ async def get(self, resource_group_name: str, account_name: str, username: str,
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LocalUser", pipeline_response)
+        deserialized = self._deserialize("LocalUser", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -311,7 +305,7 @@ async def create_or_update(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.LocalUser
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -346,7 +340,6 @@ async def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -361,7 +354,7 @@ async def create_or_update(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LocalUser", pipeline_response)
+        deserialized = self._deserialize("LocalUser", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -369,9 +362,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, account_name: str, username: str, **kwargs: Any
-    ) -> None:
+    async def delete(self, resource_group_name: str, account_name: str, username: str, **kwargs: Any) -> None:
         """Deletes the local user associated with the specified storage account.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -388,7 +379,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,
@@ -411,7 +402,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -449,7 +439,7 @@ async def list_keys(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.LocalUserKeys
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -472,7 +462,6 @@ async def list_keys(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -487,7 +476,7 @@ async def list_keys(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LocalUserKeys", pipeline_response)
+        deserialized = self._deserialize("LocalUserKeys", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -514,7 +503,7 @@ async def regenerate_password(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.LocalUserRegeneratePasswordResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -537,7 +526,6 @@ async def regenerate_password(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -552,7 +540,7 @@ async def regenerate_password(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LocalUserRegeneratePasswordResult", pipeline_response)
+        deserialized = self._deserialize("LocalUserRegeneratePasswordResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/operations/_management_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/operations/_management_policies_operations.py
index 72e568d3a45c..e79b20883bc5 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/operations/_management_policies_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/operations/_management_policies_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,
@@ -19,14 +18,12 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._management_policies_operations import (
     build_create_or_update_request,
     build_delete_request,
@@ -36,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]]
 
@@ -86,7 +83,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.ManagementPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -109,7 +106,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -123,7 +119,7 @@ async def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ManagementPolicy", pipeline_response)
+        deserialized = self._deserialize("ManagementPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -227,7 +223,7 @@ async def create_or_update(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.ManagementPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -262,7 +258,6 @@ async def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -276,7 +271,7 @@ async def create_or_update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ManagementPolicy", pipeline_response)
+        deserialized = self._deserialize("ManagementPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -284,7 +279,7 @@ async def create_or_update(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
+    async def delete(
         self,
         resource_group_name: str,
         account_name: str,
@@ -308,7 +303,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,
@@ -331,7 +326,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/operations/_object_replication_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/operations/_object_replication_policies_operations.py
index 64703fa14e5f..8d592babbf5c 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/operations/_object_replication_policies_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/operations/_object_replication_policies_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._object_replication_policies_operations import (
     build_create_or_update_request,
     build_delete_request,
@@ -40,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]]
 
@@ -90,7 +87,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-05-01"))
         cls: ClsType[_models.ObjectReplicationPolicies] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -109,7 +106,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -125,7 +121,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -177,7 +172,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.ObjectReplicationPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -200,7 +195,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -215,7 +209,7 @@ async def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response)
+        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -325,7 +319,7 @@ async def create_or_update(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.ObjectReplicationPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -360,7 +354,6 @@ async def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -375,7 +368,7 @@ async def create_or_update(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response)
+        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -383,7 +376,7 @@ async def create_or_update(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
+    async def delete(
         self, resource_group_name: str, account_name: str, object_replication_policy_id: str, **kwargs: Any
     ) -> None:
         """Deletes the object replication policy associated with the specified storage account.
@@ -404,7 +397,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,
@@ -427,7 +420,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/operations/_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/operations/_operations.py
index 47139c92d877..099148d113e1 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/operations/_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/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
@@ -20,20 +19,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._operations import build_list_request
 
 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]]
 
@@ -73,7 +70,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.Operation"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-05-01"))
         cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -89,7 +86,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -105,7 +101,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/operations/_private_endpoint_connections_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/operations/_private_endpoint_connections_operations.py
index 1d18d641080d..741a6c67814f 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/operations/_private_endpoint_connections_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/operations/_private_endpoint_connections_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._private_endpoint_connections_operations import (
     build_delete_request,
     build_get_request,
@@ -40,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]]
 
@@ -90,7 +87,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-05-01"))
         cls: ClsType[_models.PrivateEndpointConnectionListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -109,7 +106,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -125,7 +121,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -174,7 +169,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.PrivateEndpointConnection
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -197,7 +192,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -212,7 +206,7 @@ async def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response)
+        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -313,7 +307,7 @@ async def put(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.PrivateEndpointConnection
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -348,7 +342,6 @@ async def put(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -363,7 +356,7 @@ async def put(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response)
+        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -371,7 +364,7 @@ async def put(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
+    async def delete(
         self, resource_group_name: str, account_name: str, private_endpoint_connection_name: str, **kwargs: Any
     ) -> None:
         """Deletes the specified private endpoint connection associated with the storage account.
@@ -390,7 +383,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,
@@ -413,7 +406,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/operations/_private_link_resources_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/operations/_private_link_resources_operations.py
index 064c39590706..cb92ea293f2a 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/operations/_private_link_resources_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/operations/_private_link_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, Optional, Type, TypeVar
+from typing import Any, Callable, Dict, Optional, TypeVar
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -18,20 +17,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._private_link_resources_operations import build_list_by_storage_account_request
 
 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]]
 
@@ -73,7 +70,7 @@ async def list_by_storage_account(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.PrivateLinkResourceListResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -95,7 +92,6 @@ async def list_by_storage_account(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -109,7 +105,7 @@ async def list_by_storage_account(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("PrivateLinkResourceListResult", pipeline_response)
+        deserialized = self._deserialize("PrivateLinkResourceListResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/operations/_queue_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/operations/_queue_operations.py
index 5e66d951b404..6b7af6f2ec51 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/operations/_queue_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/operations/_queue_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._queue_operations import (
     build_create_request,
     build_delete_request,
@@ -41,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]]
 
@@ -166,7 +163,7 @@ async def create(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.StorageQueue
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -201,7 +198,6 @@ async def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -215,7 +211,7 @@ async def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageQueue", pipeline_response)
+        deserialized = self._deserialize("StorageQueue", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -322,7 +318,7 @@ async def update(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.StorageQueue
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -357,7 +353,6 @@ async def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -371,7 +366,7 @@ async def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageQueue", pipeline_response)
+        deserialized = self._deserialize("StorageQueue", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -400,7 +395,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.StorageQueue
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -423,7 +418,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -437,7 +431,7 @@ async def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageQueue", pipeline_response)
+        deserialized = self._deserialize("StorageQueue", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -445,9 +439,7 @@ async def get(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, queue_name: str, **kwargs: Any
-    ) -> None:
+    async def delete(self, resource_group_name: str, account_name: str, queue_name: str, **kwargs: Any) -> None:
         """Deletes the queue with the specified queue name, under the specified account if it exists.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -466,7 +458,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,
@@ -489,7 +481,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -541,7 +532,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-05-01"))
         cls: ClsType[_models.ListQueueResource] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -562,7 +553,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -578,7 +568,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/operations/_queue_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/operations/_queue_services_operations.py
index d1afb6fb371f..23d1d8b1f9c8 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/operations/_queue_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/operations/_queue_services_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, Literal, Optional, Type, TypeVar, Union, overload
+from typing import Any, Callable, Dict, IO, Literal, Optional, TypeVar, Union, overload
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -19,14 +18,12 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._queue_services_operations import (
     build_get_service_properties_request,
     build_list_request,
@@ -36,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]]
 
@@ -76,7 +73,7 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.ListQueueServices
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -98,7 +95,6 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -112,7 +108,7 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListQueueServices", pipeline_response)
+        deserialized = self._deserialize("ListQueueServices", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -207,7 +203,7 @@ async def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.QueueServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -243,7 +239,6 @@ async def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -257,7 +252,7 @@ async def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("QueueServiceProperties", pipeline_response)
+        deserialized = self._deserialize("QueueServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -282,7 +277,7 @@ async def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.QueueServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -306,7 +301,6 @@ async def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -320,7 +314,7 @@ async def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("QueueServiceProperties", pipeline_response)
+        deserialized = self._deserialize("QueueServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/operations/_skus_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/operations/_skus_operations.py
index 08e15f8e8d3d..c0c8afcb9f0c 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/operations/_skus_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/operations/_skus_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
@@ -20,20 +19,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._skus_operations import build_list_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
 
@@ -73,7 +70,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.SkuInformation"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-05-01"))
         cls: ClsType[_models.StorageSkuListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -90,7 +87,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -106,7 +102,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/operations/_storage_accounts_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/operations/_storage_accounts_operations.py
index 738667fd1c8d..833d5a4a75b9 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/operations/_storage_accounts_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/operations/_storage_accounts_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,20 @@
 # --------------------------------------------------------------------------
 from io import IOBase
 import sys
-from typing import Any, AsyncIterable, Callable, Dict, IO, Literal, Optional, Type, TypeVar, Union, cast, overload
+from typing import (
+    Any,
+    AsyncIterable,
+    AsyncIterator,
+    Callable,
+    Dict,
+    IO,
+    Literal,
+    Optional,
+    TypeVar,
+    Union,
+    cast,
+    overload,
+)
 import urllib.parse
 
 from azure.core.async_paging import AsyncItemPaged, AsyncList
@@ -18,12 +31,13 @@
     ResourceExistsError,
     ResourceNotFoundError,
     ResourceNotModifiedError,
+    StreamClosedError,
+    StreamConsumedError,
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
 from azure.core.polling import AsyncLROPoller, AsyncNoPolling, AsyncPollingMethod
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
@@ -31,7 +45,6 @@
 from azure.mgmt.core.polling.async_arm_polling import AsyncARMPolling
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._storage_accounts_operations import (
     build_abort_hierarchical_namespace_migration_request,
     build_check_name_availability_request,
@@ -54,7 +67,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]]
 
@@ -137,7 +150,7 @@ async def check_name_availability(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.CheckNameAvailabilityResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -169,7 +182,6 @@ async def check_name_availability(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -183,7 +195,7 @@ async def check_name_availability(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response)
+        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -196,8 +208,8 @@ async def _create_initial(
         account_name: str,
         parameters: Union[_models.StorageAccountCreateParameters, IO[bytes]],
         **kwargs: Any
-    ) -> Optional[_models.StorageAccount]:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -210,7 +222,7 @@ async def _create_initial(
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-05-01"))
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
-        cls: ClsType[Optional[_models.StorageAccount]] = kwargs.pop("cls", None)
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
         _json = None
@@ -231,10 +243,10 @@ async def _create_initial(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -242,12 +254,14 @@ async def _create_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = None
-        if response.status_code == 200:
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -373,10 +387,11 @@ async def begin_create(
                 params=_params,
                 **kwargs
             )
+            await raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+            deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
             if cls:
                 return cls(pipeline_response, deserialized, {})  # type: ignore
             return deserialized
@@ -399,9 +414,7 @@ def get_long_running_output(pipeline_response):
         )
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, **kwargs: Any
-    ) -> None:
+    async def delete(self, resource_group_name: str, account_name: str, **kwargs: Any) -> None:
         """Deletes a storage account in Microsoft Azure.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -415,7 +428,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,
@@ -437,7 +450,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -482,7 +494,7 @@ async def get_properties(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -505,7 +517,6 @@ async def get_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -519,7 +530,7 @@ async def get_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -630,7 +641,7 @@ async def update(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -664,7 +675,6 @@ async def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -678,7 +688,7 @@ async def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -701,7 +711,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.StorageAccount"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-05-01"))
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -718,7 +728,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -734,7 +743,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -784,7 +792,7 @@ def list_by_resource_group(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-05-01"))
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -802,7 +810,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -818,7 +825,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -868,7 +874,7 @@ async def list_keys(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.StorageAccountListKeysResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -891,7 +897,6 @@ async def list_keys(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -905,7 +910,7 @@ async def list_keys(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response)
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -999,7 +1004,7 @@ async def regenerate_key(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.StorageAccountListKeysResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1033,7 +1038,6 @@ async def regenerate_key(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1047,7 +1051,7 @@ async def regenerate_key(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response)
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1138,7 +1142,7 @@ async def list_account_sas(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.ListAccountSasResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1172,7 +1176,6 @@ async def list_account_sas(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1186,7 +1189,7 @@ async def list_account_sas(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListAccountSasResponse", pipeline_response)
+        deserialized = self._deserialize("ListAccountSasResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1275,7 +1278,7 @@ async def list_service_sas(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.ListServiceSasResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1309,7 +1312,6 @@ async def list_service_sas(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1323,17 +1325,17 @@ async def list_service_sas(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListServiceSasResponse", pipeline_response)
+        deserialized = self._deserialize("ListServiceSasResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
 
         return deserialized  # type: ignore
 
-    async def _failover_initial(  # pylint: disable=inconsistent-return-statements
+    async def _failover_initial(
         self, resource_group_name: str, account_name: str, **kwargs: Any
-    ) -> None:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1345,7 +1347,7 @@ async def _failover_initial(  # pylint: disable=inconsistent-return-statements
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-05-01"))
-        cls: ClsType[None] = kwargs.pop("cls", None)
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
 
         _request = build_failover_request(
             resource_group_name=resource_group_name,
@@ -1355,10 +1357,10 @@ async def _failover_initial(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -1366,11 +1368,19 @@ async def _failover_initial(  # pylint: disable=inconsistent-return-statements
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
-            return cls(pipeline_response, None, {})  # type: ignore
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
 
     @distributed_trace_async
     async def begin_failover(self, resource_group_name: str, account_name: str, **kwargs: Any) -> AsyncLROPoller[None]:
@@ -1398,7 +1408,7 @@ async def begin_failover(self, resource_group_name: str, account_name: str, **kw
         lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
         cont_token: Optional[str] = kwargs.pop("continuation_token", None)
         if cont_token is None:
-            raw_result = await self._failover_initial(  # type: ignore
+            raw_result = await self._failover_initial(
                 resource_group_name=resource_group_name,
                 account_name=account_name,
                 api_version=api_version,
@@ -1407,6 +1417,7 @@ async def begin_failover(self, resource_group_name: str, account_name: str, **kw
                 params=_params,
                 **kwargs
             )
+            await raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
@@ -1430,10 +1441,10 @@ def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-
             )
         return AsyncLROPoller[None](self._client, raw_result, get_long_running_output, polling_method)  # type: ignore
 
-    async def _hierarchical_namespace_migration_initial(  # pylint: disable=inconsistent-return-statements,name-too-long
+    async def _hierarchical_namespace_migration_initial(  # pylint: disable=name-too-long
         self, resource_group_name: str, account_name: str, request_type: str, **kwargs: Any
-    ) -> None:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1445,7 +1456,7 @@ async def _hierarchical_namespace_migration_initial(  # pylint: disable=inconsis
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-05-01"))
-        cls: ClsType[None] = kwargs.pop("cls", None)
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
 
         _request = build_hierarchical_namespace_migration_request(
             resource_group_name=resource_group_name,
@@ -1456,10 +1467,10 @@ async def _hierarchical_namespace_migration_initial(  # pylint: disable=inconsis
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -1467,12 +1478,20 @@ async def _hierarchical_namespace_migration_initial(  # pylint: disable=inconsis
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
-            return cls(pipeline_response, None, {})  # type: ignore
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
 
     @distributed_trace_async
     async def begin_hierarchical_namespace_migration(
@@ -1505,7 +1524,7 @@ async def begin_hierarchical_namespace_migration(
         lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
         cont_token: Optional[str] = kwargs.pop("continuation_token", None)
         if cont_token is None:
-            raw_result = await self._hierarchical_namespace_migration_initial(  # type: ignore
+            raw_result = await self._hierarchical_namespace_migration_initial(
                 resource_group_name=resource_group_name,
                 account_name=account_name,
                 request_type=request_type,
@@ -1515,6 +1534,7 @@ async def begin_hierarchical_namespace_migration(
                 params=_params,
                 **kwargs
             )
+            await raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
@@ -1538,10 +1558,10 @@ def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-
             )
         return AsyncLROPoller[None](self._client, raw_result, get_long_running_output, polling_method)  # type: ignore
 
-    async def _abort_hierarchical_namespace_migration_initial(  # pylint: disable=inconsistent-return-statements,name-too-long
+    async def _abort_hierarchical_namespace_migration_initial(  # pylint: disable=name-too-long
         self, resource_group_name: str, account_name: str, **kwargs: Any
-    ) -> None:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1553,7 +1573,7 @@ async def _abort_hierarchical_namespace_migration_initial(  # pylint: disable=in
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-05-01"))
-        cls: ClsType[None] = kwargs.pop("cls", None)
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
 
         _request = build_abort_hierarchical_namespace_migration_request(
             resource_group_name=resource_group_name,
@@ -1563,10 +1583,10 @@ async def _abort_hierarchical_namespace_migration_initial(  # pylint: disable=in
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -1574,12 +1594,20 @@ async def _abort_hierarchical_namespace_migration_initial(  # pylint: disable=in
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
-            return cls(pipeline_response, None, {})  # type: ignore
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
 
     @distributed_trace_async
     async def begin_abort_hierarchical_namespace_migration(  # pylint: disable=name-too-long
@@ -1607,7 +1635,7 @@ async def begin_abort_hierarchical_namespace_migration(  # pylint: disable=name-
         lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
         cont_token: Optional[str] = kwargs.pop("continuation_token", None)
         if cont_token is None:
-            raw_result = await self._abort_hierarchical_namespace_migration_initial(  # type: ignore
+            raw_result = await self._abort_hierarchical_namespace_migration_initial(
                 resource_group_name=resource_group_name,
                 account_name=account_name,
                 api_version=api_version,
@@ -1616,6 +1644,7 @@ async def begin_abort_hierarchical_namespace_migration(  # pylint: disable=name-
                 params=_params,
                 **kwargs
             )
+            await raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
@@ -1645,8 +1674,8 @@ async def _restore_blob_ranges_initial(
         account_name: str,
         parameters: Union[_models.BlobRestoreParameters, IO[bytes]],
         **kwargs: Any
-    ) -> _models.BlobRestoreStatus:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1659,7 +1688,7 @@ async def _restore_blob_ranges_initial(
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-05-01"))
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
-        cls: ClsType[_models.BlobRestoreStatus] = kwargs.pop("cls", None)
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
         _json = None
@@ -1680,10 +1709,10 @@ async def _restore_blob_ranges_initial(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -1691,14 +1720,14 @@ async def _restore_blob_ranges_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response)
-
-        if response.status_code == 202:
-            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response)
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1814,10 +1843,11 @@ async def begin_restore_blob_ranges(
                 params=_params,
                 **kwargs
             )
+            await raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):
-            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response)
+            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response.http_response)
             if cls:
                 return cls(pipeline_response, deserialized, {})  # type: ignore
             return deserialized
@@ -1842,9 +1872,7 @@ def get_long_running_output(pipeline_response):
         )
 
     @distributed_trace_async
-    async def revoke_user_delegation_keys(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, **kwargs: Any
-    ) -> None:
+    async def revoke_user_delegation_keys(self, resource_group_name: str, account_name: str, **kwargs: Any) -> None:
         """Revoke user delegation keys.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -1858,7 +1886,7 @@ async def revoke_user_delegation_keys(  # pylint: disable=inconsistent-return-st
         :rtype: None
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1880,7 +1908,6 @@ async def revoke_user_delegation_keys(  # pylint: disable=inconsistent-return-st
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/operations/_table_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/operations/_table_operations.py
index 15059014d8c9..28de2a34933a 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/operations/_table_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/operations/_table_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._table_operations import (
     build_create_request,
     build_delete_request,
@@ -41,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]]
 
@@ -163,7 +160,7 @@ async def create(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.Table
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -201,7 +198,6 @@ async def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -215,7 +211,7 @@ async def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("Table", pipeline_response)
+        deserialized = self._deserialize("Table", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -319,7 +315,7 @@ async def update(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.Table
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -357,7 +353,6 @@ async def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -371,7 +366,7 @@ async def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("Table", pipeline_response)
+        deserialized = self._deserialize("Table", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -397,7 +392,7 @@ async def get(self, resource_group_name: str, account_name: str, table_name: str
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.Table
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -420,7 +415,6 @@ async def get(self, resource_group_name: str, account_name: str, table_name: str
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -434,7 +428,7 @@ async def get(self, resource_group_name: str, account_name: str, table_name: str
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("Table", pipeline_response)
+        deserialized = self._deserialize("Table", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -442,9 +436,7 @@ async def get(self, resource_group_name: str, account_name: str, table_name: str
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, table_name: str, **kwargs: Any
-    ) -> None:
+    async def delete(self, resource_group_name: str, account_name: str, table_name: str, **kwargs: Any) -> None:
         """Deletes the table with the specified table name, under the specified account if it exists.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -462,7 +454,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,
@@ -485,7 +477,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -523,7 +514,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> As
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-05-01"))
         cls: ClsType[_models.ListTableResource] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -542,7 +533,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -558,7 +548,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/operations/_table_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/operations/_table_services_operations.py
index f9c294c07f01..137df8f6f181 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/operations/_table_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/operations/_table_services_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, Literal, Optional, Type, TypeVar, Union, overload
+from typing import Any, Callable, Dict, IO, Literal, Optional, TypeVar, Union, overload
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -19,14 +18,12 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._table_services_operations import (
     build_get_service_properties_request,
     build_list_request,
@@ -36,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]]
 
@@ -76,7 +73,7 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.ListTableServices
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -98,7 +95,6 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -112,7 +108,7 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListTableServices", pipeline_response)
+        deserialized = self._deserialize("ListTableServices", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -207,7 +203,7 @@ async def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.TableServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -243,7 +239,6 @@ async def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -257,7 +252,7 @@ async def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("TableServiceProperties", pipeline_response)
+        deserialized = self._deserialize("TableServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -282,7 +277,7 @@ async def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.TableServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -306,7 +301,6 @@ async def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -320,7 +314,7 @@ async def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("TableServiceProperties", pipeline_response)
+        deserialized = self._deserialize("TableServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/operations/_usages_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/operations/_usages_operations.py
index dda5586e6d9d..c94f6d20e6f0 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/operations/_usages_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/aio/operations/_usages_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
@@ -20,20 +19,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._usages_operations import build_list_by_location_request
 
 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 +72,7 @@ def list_by_location(self, location: str, **kwargs: Any) -> AsyncIterable["_mode
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-05-01"))
         cls: ClsType[_models.UsageListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -93,7 +90,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -109,7 +105,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/models/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/models/__init__.py
index 2f41bf74a603..8d4e9a5603dc 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/models/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/models/__init__.py
@@ -5,222 +5,233 @@
 # 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 AccessPolicy
-from ._models_py3 import AccountImmutabilityPolicyProperties
-from ._models_py3 import AccountSasParameters
-from ._models_py3 import ActiveDirectoryProperties
-from ._models_py3 import AzureEntityResource
-from ._models_py3 import AzureFilesIdentityBasedAuthentication
-from ._models_py3 import BlobContainer
-from ._models_py3 import BlobInventoryPolicy
-from ._models_py3 import BlobInventoryPolicyDefinition
-from ._models_py3 import BlobInventoryPolicyFilter
-from ._models_py3 import BlobInventoryPolicyRule
-from ._models_py3 import BlobInventoryPolicySchema
-from ._models_py3 import BlobRestoreParameters
-from ._models_py3 import BlobRestoreRange
-from ._models_py3 import BlobRestoreStatus
-from ._models_py3 import BlobServiceItems
-from ._models_py3 import BlobServiceProperties
-from ._models_py3 import ChangeFeed
-from ._models_py3 import CheckNameAvailabilityResult
-from ._models_py3 import CloudErrorBody
-from ._models_py3 import CorsRule
-from ._models_py3 import CorsRules
-from ._models_py3 import CustomDomain
-from ._models_py3 import DateAfterCreation
-from ._models_py3 import DateAfterModification
-from ._models_py3 import DeleteRetentionPolicy
-from ._models_py3 import DeletedAccount
-from ._models_py3 import DeletedAccountListResult
-from ._models_py3 import DeletedShare
-from ._models_py3 import Dimension
-from ._models_py3 import Encryption
-from ._models_py3 import EncryptionIdentity
-from ._models_py3 import EncryptionScope
-from ._models_py3 import EncryptionScopeKeyVaultProperties
-from ._models_py3 import EncryptionScopeListResult
-from ._models_py3 import EncryptionService
-from ._models_py3 import EncryptionServices
-from ._models_py3 import Endpoints
-from ._models_py3 import ErrorResponse
-from ._models_py3 import ErrorResponseBody
-from ._models_py3 import ExtendedLocation
-from ._models_py3 import FileServiceItems
-from ._models_py3 import FileServiceProperties
-from ._models_py3 import FileShare
-from ._models_py3 import FileShareItem
-from ._models_py3 import FileShareItems
-from ._models_py3 import GeoReplicationStats
-from ._models_py3 import IPRule
-from ._models_py3 import Identity
-from ._models_py3 import ImmutabilityPolicy
-from ._models_py3 import ImmutabilityPolicyProperties
-from ._models_py3 import ImmutableStorageAccount
-from ._models_py3 import ImmutableStorageWithVersioning
-from ._models_py3 import KeyCreationTime
-from ._models_py3 import KeyPolicy
-from ._models_py3 import KeyVaultProperties
-from ._models_py3 import LastAccessTimeTrackingPolicy
-from ._models_py3 import LeaseContainerRequest
-from ._models_py3 import LeaseContainerResponse
-from ._models_py3 import LeaseShareRequest
-from ._models_py3 import LeaseShareResponse
-from ._models_py3 import LegalHold
-from ._models_py3 import LegalHoldProperties
-from ._models_py3 import ListAccountSasResponse
-from ._models_py3 import ListBlobInventoryPolicy
-from ._models_py3 import ListContainerItem
-from ._models_py3 import ListContainerItems
-from ._models_py3 import ListQueue
-from ._models_py3 import ListQueueResource
-from ._models_py3 import ListQueueServices
-from ._models_py3 import ListServiceSasResponse
-from ._models_py3 import ListTableResource
-from ._models_py3 import ListTableServices
-from ._models_py3 import LocalUser
-from ._models_py3 import LocalUserKeys
-from ._models_py3 import LocalUserRegeneratePasswordResult
-from ._models_py3 import LocalUsers
-from ._models_py3 import ManagementPolicy
-from ._models_py3 import ManagementPolicyAction
-from ._models_py3 import ManagementPolicyBaseBlob
-from ._models_py3 import ManagementPolicyDefinition
-from ._models_py3 import ManagementPolicyFilter
-from ._models_py3 import ManagementPolicyRule
-from ._models_py3 import ManagementPolicySchema
-from ._models_py3 import ManagementPolicySnapShot
-from ._models_py3 import ManagementPolicyVersion
-from ._models_py3 import MetricSpecification
-from ._models_py3 import Multichannel
-from ._models_py3 import NetworkRuleSet
-from ._models_py3 import ObjectReplicationPolicies
-from ._models_py3 import ObjectReplicationPolicy
-from ._models_py3 import ObjectReplicationPolicyFilter
-from ._models_py3 import ObjectReplicationPolicyRule
-from ._models_py3 import Operation
-from ._models_py3 import OperationDisplay
-from ._models_py3 import OperationListResult
-from ._models_py3 import PermissionScope
-from ._models_py3 import PrivateEndpoint
-from ._models_py3 import PrivateEndpointConnection
-from ._models_py3 import PrivateEndpointConnectionListResult
-from ._models_py3 import PrivateLinkResource
-from ._models_py3 import PrivateLinkResourceListResult
-from ._models_py3 import PrivateLinkServiceConnectionState
-from ._models_py3 import ProtectedAppendWritesHistory
-from ._models_py3 import ProtocolSettings
-from ._models_py3 import ProxyResource
-from ._models_py3 import QueueServiceProperties
-from ._models_py3 import Resource
-from ._models_py3 import ResourceAccessRule
-from ._models_py3 import RestorePolicyProperties
-from ._models_py3 import Restriction
-from ._models_py3 import RoutingPreference
-from ._models_py3 import SKUCapability
-from ._models_py3 import SasPolicy
-from ._models_py3 import ServiceSasParameters
-from ._models_py3 import ServiceSpecification
-from ._models_py3 import SignedIdentifier
-from ._models_py3 import Sku
-from ._models_py3 import SkuInformation
-from ._models_py3 import SmbSetting
-from ._models_py3 import SshPublicKey
-from ._models_py3 import StorageAccount
-from ._models_py3 import StorageAccountCheckNameAvailabilityParameters
-from ._models_py3 import StorageAccountCreateParameters
-from ._models_py3 import StorageAccountInternetEndpoints
-from ._models_py3 import StorageAccountKey
-from ._models_py3 import StorageAccountListKeysResult
-from ._models_py3 import StorageAccountListResult
-from ._models_py3 import StorageAccountMicrosoftEndpoints
-from ._models_py3 import StorageAccountRegenerateKeyParameters
-from ._models_py3 import StorageAccountSkuConversionStatus
-from ._models_py3 import StorageAccountUpdateParameters
-from ._models_py3 import StorageQueue
-from ._models_py3 import StorageSkuListResult
-from ._models_py3 import SystemData
-from ._models_py3 import Table
-from ._models_py3 import TableAccessPolicy
-from ._models_py3 import TableServiceProperties
-from ._models_py3 import TableSignedIdentifier
-from ._models_py3 import TagFilter
-from ._models_py3 import TagProperty
-from ._models_py3 import TrackedResource
-from ._models_py3 import UpdateHistoryProperty
-from ._models_py3 import Usage
-from ._models_py3 import UsageListResult
-from ._models_py3 import UsageName
-from ._models_py3 import UserAssignedIdentity
-from ._models_py3 import VirtualNetworkRule
+from typing import TYPE_CHECKING
 
-from ._storage_management_client_enums import AccessTier
-from ._storage_management_client_enums import AccountImmutabilityPolicyState
-from ._storage_management_client_enums import AccountStatus
-from ._storage_management_client_enums import AccountType
-from ._storage_management_client_enums import AllowedCopyScope
-from ._storage_management_client_enums import AllowedMethods
-from ._storage_management_client_enums import BlobInventoryPolicyName
-from ._storage_management_client_enums import BlobRestoreProgressStatus
-from ._storage_management_client_enums import Bypass
-from ._storage_management_client_enums import CreatedByType
-from ._storage_management_client_enums import DefaultAction
-from ._storage_management_client_enums import DefaultSharePermission
-from ._storage_management_client_enums import DirectoryServiceOptions
-from ._storage_management_client_enums import DnsEndpointType
-from ._storage_management_client_enums import EnabledProtocols
-from ._storage_management_client_enums import EncryptionScopeSource
-from ._storage_management_client_enums import EncryptionScopeState
-from ._storage_management_client_enums import ExpirationAction
-from ._storage_management_client_enums import ExtendedLocationTypes
-from ._storage_management_client_enums import Format
-from ._storage_management_client_enums import GeoReplicationStatus
-from ._storage_management_client_enums import HttpProtocol
-from ._storage_management_client_enums import IdentityType
-from ._storage_management_client_enums import ImmutabilityPolicyState
-from ._storage_management_client_enums import ImmutabilityPolicyUpdateType
-from ._storage_management_client_enums import InventoryRuleType
-from ._storage_management_client_enums import KeyPermission
-from ._storage_management_client_enums import KeySource
-from ._storage_management_client_enums import KeyType
-from ._storage_management_client_enums import Kind
-from ._storage_management_client_enums import LargeFileSharesState
-from ._storage_management_client_enums import LeaseContainerRequestEnum
-from ._storage_management_client_enums import LeaseDuration
-from ._storage_management_client_enums import LeaseShareAction
-from ._storage_management_client_enums import LeaseState
-from ._storage_management_client_enums import LeaseStatus
-from ._storage_management_client_enums import ListContainersInclude
-from ._storage_management_client_enums import ManagementPolicyName
-from ._storage_management_client_enums import MigrationState
-from ._storage_management_client_enums import MinimumTlsVersion
-from ._storage_management_client_enums import Name
-from ._storage_management_client_enums import ObjectType
-from ._storage_management_client_enums import Permissions
-from ._storage_management_client_enums import PrivateEndpointConnectionProvisioningState
-from ._storage_management_client_enums import PrivateEndpointServiceConnectionStatus
-from ._storage_management_client_enums import ProvisioningState
-from ._storage_management_client_enums import PublicAccess
-from ._storage_management_client_enums import PublicNetworkAccess
-from ._storage_management_client_enums import Reason
-from ._storage_management_client_enums import ReasonCode
-from ._storage_management_client_enums import RootSquashType
-from ._storage_management_client_enums import RoutingChoice
-from ._storage_management_client_enums import RuleType
-from ._storage_management_client_enums import Schedule
-from ._storage_management_client_enums import Services
-from ._storage_management_client_enums import ShareAccessTier
-from ._storage_management_client_enums import SignedResource
-from ._storage_management_client_enums import SignedResourceTypes
-from ._storage_management_client_enums import SkuConversionStatus
-from ._storage_management_client_enums import SkuName
-from ._storage_management_client_enums import SkuTier
-from ._storage_management_client_enums import State
-from ._storage_management_client_enums import StorageAccountExpand
-from ._storage_management_client_enums import UsageUnit
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+
+from ._models_py3 import (  # type: ignore
+    AccessPolicy,
+    AccountImmutabilityPolicyProperties,
+    AccountSasParameters,
+    ActiveDirectoryProperties,
+    AzureEntityResource,
+    AzureFilesIdentityBasedAuthentication,
+    BlobContainer,
+    BlobInventoryPolicy,
+    BlobInventoryPolicyDefinition,
+    BlobInventoryPolicyFilter,
+    BlobInventoryPolicyRule,
+    BlobInventoryPolicySchema,
+    BlobRestoreParameters,
+    BlobRestoreRange,
+    BlobRestoreStatus,
+    BlobServiceItems,
+    BlobServiceProperties,
+    ChangeFeed,
+    CheckNameAvailabilityResult,
+    CloudErrorBody,
+    CorsRule,
+    CorsRules,
+    CustomDomain,
+    DateAfterCreation,
+    DateAfterModification,
+    DeleteRetentionPolicy,
+    DeletedAccount,
+    DeletedAccountListResult,
+    DeletedShare,
+    Dimension,
+    Encryption,
+    EncryptionIdentity,
+    EncryptionScope,
+    EncryptionScopeKeyVaultProperties,
+    EncryptionScopeListResult,
+    EncryptionService,
+    EncryptionServices,
+    Endpoints,
+    ErrorResponse,
+    ErrorResponseBody,
+    ExtendedLocation,
+    FileServiceItems,
+    FileServiceProperties,
+    FileShare,
+    FileShareItem,
+    FileShareItems,
+    GeoReplicationStats,
+    IPRule,
+    Identity,
+    ImmutabilityPolicy,
+    ImmutabilityPolicyProperties,
+    ImmutableStorageAccount,
+    ImmutableStorageWithVersioning,
+    KeyCreationTime,
+    KeyPolicy,
+    KeyVaultProperties,
+    LastAccessTimeTrackingPolicy,
+    LeaseContainerRequest,
+    LeaseContainerResponse,
+    LeaseShareRequest,
+    LeaseShareResponse,
+    LegalHold,
+    LegalHoldProperties,
+    ListAccountSasResponse,
+    ListBlobInventoryPolicy,
+    ListContainerItem,
+    ListContainerItems,
+    ListQueue,
+    ListQueueResource,
+    ListQueueServices,
+    ListServiceSasResponse,
+    ListTableResource,
+    ListTableServices,
+    LocalUser,
+    LocalUserKeys,
+    LocalUserRegeneratePasswordResult,
+    LocalUsers,
+    ManagementPolicy,
+    ManagementPolicyAction,
+    ManagementPolicyBaseBlob,
+    ManagementPolicyDefinition,
+    ManagementPolicyFilter,
+    ManagementPolicyRule,
+    ManagementPolicySchema,
+    ManagementPolicySnapShot,
+    ManagementPolicyVersion,
+    MetricSpecification,
+    Multichannel,
+    NetworkRuleSet,
+    ObjectReplicationPolicies,
+    ObjectReplicationPolicy,
+    ObjectReplicationPolicyFilter,
+    ObjectReplicationPolicyRule,
+    Operation,
+    OperationDisplay,
+    OperationListResult,
+    PermissionScope,
+    PrivateEndpoint,
+    PrivateEndpointConnection,
+    PrivateEndpointConnectionListResult,
+    PrivateLinkResource,
+    PrivateLinkResourceListResult,
+    PrivateLinkServiceConnectionState,
+    ProtectedAppendWritesHistory,
+    ProtocolSettings,
+    ProxyResource,
+    QueueServiceProperties,
+    Resource,
+    ResourceAccessRule,
+    RestorePolicyProperties,
+    Restriction,
+    RoutingPreference,
+    SKUCapability,
+    SasPolicy,
+    ServiceSasParameters,
+    ServiceSpecification,
+    SignedIdentifier,
+    Sku,
+    SkuInformation,
+    SmbSetting,
+    SshPublicKey,
+    StorageAccount,
+    StorageAccountCheckNameAvailabilityParameters,
+    StorageAccountCreateParameters,
+    StorageAccountInternetEndpoints,
+    StorageAccountKey,
+    StorageAccountListKeysResult,
+    StorageAccountListResult,
+    StorageAccountMicrosoftEndpoints,
+    StorageAccountRegenerateKeyParameters,
+    StorageAccountSkuConversionStatus,
+    StorageAccountUpdateParameters,
+    StorageQueue,
+    StorageSkuListResult,
+    SystemData,
+    Table,
+    TableAccessPolicy,
+    TableServiceProperties,
+    TableSignedIdentifier,
+    TagFilter,
+    TagProperty,
+    TrackedResource,
+    UpdateHistoryProperty,
+    Usage,
+    UsageListResult,
+    UsageName,
+    UserAssignedIdentity,
+    VirtualNetworkRule,
+)
+
+from ._storage_management_client_enums import (  # type: ignore
+    AccessTier,
+    AccountImmutabilityPolicyState,
+    AccountStatus,
+    AccountType,
+    AllowedCopyScope,
+    AllowedMethods,
+    BlobInventoryPolicyName,
+    BlobRestoreProgressStatus,
+    Bypass,
+    CreatedByType,
+    DefaultAction,
+    DefaultSharePermission,
+    DirectoryServiceOptions,
+    DnsEndpointType,
+    EnabledProtocols,
+    EncryptionScopeSource,
+    EncryptionScopeState,
+    ExpirationAction,
+    ExtendedLocationTypes,
+    Format,
+    GeoReplicationStatus,
+    HttpProtocol,
+    IdentityType,
+    ImmutabilityPolicyState,
+    ImmutabilityPolicyUpdateType,
+    InventoryRuleType,
+    KeyPermission,
+    KeySource,
+    KeyType,
+    Kind,
+    LargeFileSharesState,
+    LeaseContainerRequestEnum,
+    LeaseDuration,
+    LeaseShareAction,
+    LeaseState,
+    LeaseStatus,
+    ListContainersInclude,
+    ManagementPolicyName,
+    MigrationState,
+    MinimumTlsVersion,
+    Name,
+    ObjectType,
+    Permissions,
+    PrivateEndpointConnectionProvisioningState,
+    PrivateEndpointServiceConnectionStatus,
+    ProvisioningState,
+    PublicAccess,
+    PublicNetworkAccess,
+    Reason,
+    ReasonCode,
+    RootSquashType,
+    RoutingChoice,
+    RuleType,
+    Schedule,
+    Services,
+    ShareAccessTier,
+    SignedResource,
+    SignedResourceTypes,
+    SkuConversionStatus,
+    SkuName,
+    SkuTier,
+    State,
+    StorageAccountExpand,
+    UsageUnit,
+)
 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__ = [
@@ -437,5 +448,5 @@
     "StorageAccountExpand",
     "UsageUnit",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/models/_models_py3.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/models/_models_py3.py
index 6676e407cce5..02da97f394d6 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/models/_models_py3.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/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
 
 
@@ -440,7 +439,7 @@ def __init__(
         self.default_share_permission = default_share_permission
 
 
-class BlobContainer(AzureEntityResource):  # pylint: disable=too-many-instance-attributes
+class BlobContainer(AzureEntityResource):
     """Properties of the blob container, including Id, resource name, resource type, Etag.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -1107,7 +1106,7 @@ def __init__(self, **kwargs: Any) -> None:
         self.value = None
 
 
-class BlobServiceProperties(Resource):  # pylint: disable=too-many-instance-attributes
+class BlobServiceProperties(Resource):
     """The properties of a storage account’s Blob service.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -2420,7 +2419,7 @@ def __init__(
         self.protocol_settings = protocol_settings
 
 
-class FileShare(AzureEntityResource):  # pylint: disable=too-many-instance-attributes
+class FileShare(AzureEntityResource):
     """Properties of the file share, including Id, resource name, resource type, Etag.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -2578,7 +2577,7 @@ def __init__(
         self.snapshot_time = None
 
 
-class FileShareItem(AzureEntityResource):  # pylint: disable=too-many-instance-attributes
+class FileShareItem(AzureEntityResource):
     """The file share properties be listed out.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -3342,7 +3341,7 @@ class LeaseContainerRequest(_serialization.Model):
     All required parameters must be populated in order to send to server.
 
     :ivar action: Specifies the lease action. Can be one of the available actions. Required. Known
-     values are: "Acquire", "Renew", "Change", "Release", and "Break".
+     values are: "Acquire", "Renew", "Change", "Release", "Break", and "Break".
     :vartype action: str or ~azure.mgmt.storage.v2022_05_01.models.LeaseContainerRequestEnum
     :ivar lease_id: Identifies the lease. Can be specified in any valid GUID string format.
     :vartype lease_id: str
@@ -3381,7 +3380,7 @@ def __init__(
     ) -> None:
         """
         :keyword action: Specifies the lease action. Can be one of the available actions. Required.
-         Known values are: "Acquire", "Renew", "Change", "Release", and "Break".
+         Known values are: "Acquire", "Renew", "Change", "Release", "Break", and "Break".
         :paramtype action: str or ~azure.mgmt.storage.v2022_05_01.models.LeaseContainerRequestEnum
         :keyword lease_id: Identifies the lease. Can be specified in any valid GUID string format.
         :paramtype lease_id: str
@@ -3439,7 +3438,7 @@ class LeaseShareRequest(_serialization.Model):
     All required parameters must be populated in order to send to server.
 
     :ivar action: Specifies the lease action. Can be one of the available actions. Required. Known
-     values are: "Acquire", "Renew", "Change", "Release", and "Break".
+     values are: "Acquire", "Renew", "Change", "Release", "Break", and "Break".
     :vartype action: str or ~azure.mgmt.storage.v2022_05_01.models.LeaseShareAction
     :ivar lease_id: Identifies the lease. Can be specified in any valid GUID string format.
     :vartype lease_id: str
@@ -3478,7 +3477,7 @@ def __init__(
     ) -> None:
         """
         :keyword action: Specifies the lease action. Can be one of the available actions. Required.
-         Known values are: "Acquire", "Renew", "Change", "Release", and "Break".
+         Known values are: "Acquire", "Renew", "Change", "Release", "Break", and "Break".
         :paramtype action: str or ~azure.mgmt.storage.v2022_05_01.models.LeaseShareAction
         :keyword lease_id: Identifies the lease. Can be specified in any valid GUID string format.
         :paramtype lease_id: str
@@ -3676,7 +3675,7 @@ def __init__(self, **kwargs: Any) -> None:
         self.value = None
 
 
-class ListContainerItem(AzureEntityResource):  # pylint: disable=too-many-instance-attributes
+class ListContainerItem(AzureEntityResource):
     """The blob container properties be listed out.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -4044,7 +4043,7 @@ def __init__(self, **kwargs: Any) -> None:
         self.value = None
 
 
-class LocalUser(Resource):  # pylint: disable=too-many-instance-attributes
+class LocalUser(Resource):
     """The local user associated with the storage accounts.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -5642,7 +5641,7 @@ def __init__(
         self.expiration_action = expiration_action
 
 
-class ServiceSasParameters(_serialization.Model):  # pylint: disable=too-many-instance-attributes
+class ServiceSasParameters(_serialization.Model):
     """The parameters to list service SAS credentials of a specific resource.
 
     All required parameters must be populated in order to send to server.
@@ -6076,7 +6075,7 @@ class SshPublicKey(_serialization.Model):
 
     :ivar description: Optional. It is used to store the function/usage of the key.
     :vartype description: str
-    :ivar key: Ssh public key base64 encoded. The format should be: ':code:`<keyType>`
+    :ivar key: Ssh public key base64 encoded. The format should be: '\\ :code:`<keyType>`
      :code:`<keyData>`', e.g. ssh-rsa AAAABBBB.
     :vartype key: str
     """
@@ -6090,7 +6089,7 @@ def __init__(self, *, description: Optional[str] = None, key: Optional[str] = No
         """
         :keyword description: Optional. It is used to store the function/usage of the key.
         :paramtype description: str
-        :keyword key: Ssh public key base64 encoded. The format should be: ':code:`<keyType>`
+        :keyword key: Ssh public key base64 encoded. The format should be: '\\ :code:`<keyType>`
          :code:`<keyData>`', e.g. ssh-rsa AAAABBBB.
         :paramtype key: str
         """
@@ -6148,7 +6147,7 @@ def __init__(self, *, location: str, tags: Optional[Dict[str, str]] = None, **kw
         self.location = location
 
 
-class StorageAccount(TrackedResource):  # pylint: disable=too-many-instance-attributes
+class StorageAccount(TrackedResource):
     """The storage account.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -6568,7 +6567,7 @@ def __init__(self, *, name: str, **kwargs: Any) -> None:
         self.name = name
 
 
-class StorageAccountCreateParameters(_serialization.Model):  # pylint: disable=too-many-instance-attributes
+class StorageAccountCreateParameters(_serialization.Model):
     """The parameters used when creating a storage account.
 
     All required parameters must be populated in order to send to server.
@@ -7137,7 +7136,7 @@ def __init__(self, *, target_sku_name: Optional[Union[str, "_models.SkuName"]] =
         self.end_time = None
 
 
-class StorageAccountUpdateParameters(_serialization.Model):  # pylint: disable=too-many-instance-attributes
+class StorageAccountUpdateParameters(_serialization.Model):
     """The parameters that can be provided when updating the storage account properties.
 
     :ivar sku: Gets or sets the SKU name. Note that the SKU name cannot be updated to Standard_ZRS,
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/models/_storage_management_client_enums.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/models/_storage_management_client_enums.py
index d93e08dd22d6..3c9ba4b4feed 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/models/_storage_management_client_enums.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/models/_storage_management_client_enums.py
@@ -292,6 +292,7 @@ class LeaseContainerRequestEnum(str, Enum, metaclass=CaseInsensitiveEnumMeta):
     RENEW = "Renew"
     CHANGE = "Change"
     RELEASE = "Release"
+    BREAK = "Break"
     BREAK_ENUM = "Break"
 
 
@@ -311,6 +312,7 @@ class LeaseShareAction(str, Enum, metaclass=CaseInsensitiveEnumMeta):
     RENEW = "Renew"
     CHANGE = "Change"
     RELEASE = "Release"
+    BREAK = "Break"
     BREAK_ENUM = "Break"
 
 
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/operations/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/operations/__init__.py
index bbce85749d18..a0549517e087 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/operations/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/operations/__init__.py
@@ -5,30 +5,36 @@
 # 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 ._skus_operations import SkusOperations
-from ._storage_accounts_operations import StorageAccountsOperations
-from ._deleted_accounts_operations import DeletedAccountsOperations
-from ._usages_operations import UsagesOperations
-from ._management_policies_operations import ManagementPoliciesOperations
-from ._blob_inventory_policies_operations import BlobInventoryPoliciesOperations
-from ._private_endpoint_connections_operations import PrivateEndpointConnectionsOperations
-from ._private_link_resources_operations import PrivateLinkResourcesOperations
-from ._object_replication_policies_operations import ObjectReplicationPoliciesOperations
-from ._local_users_operations import LocalUsersOperations
-from ._encryption_scopes_operations import EncryptionScopesOperations
-from ._blob_services_operations import BlobServicesOperations
-from ._blob_containers_operations import BlobContainersOperations
-from ._file_services_operations import FileServicesOperations
-from ._file_shares_operations import FileSharesOperations
-from ._queue_services_operations import QueueServicesOperations
-from ._queue_operations import QueueOperations
-from ._table_services_operations import TableServicesOperations
-from ._table_operations import TableOperations
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._operations import Operations  # type: ignore
+from ._skus_operations import SkusOperations  # type: ignore
+from ._storage_accounts_operations import StorageAccountsOperations  # type: ignore
+from ._deleted_accounts_operations import DeletedAccountsOperations  # type: ignore
+from ._usages_operations import UsagesOperations  # type: ignore
+from ._management_policies_operations import ManagementPoliciesOperations  # type: ignore
+from ._blob_inventory_policies_operations import BlobInventoryPoliciesOperations  # type: ignore
+from ._private_endpoint_connections_operations import PrivateEndpointConnectionsOperations  # type: ignore
+from ._private_link_resources_operations import PrivateLinkResourcesOperations  # type: ignore
+from ._object_replication_policies_operations import ObjectReplicationPoliciesOperations  # type: ignore
+from ._local_users_operations import LocalUsersOperations  # type: ignore
+from ._encryption_scopes_operations import EncryptionScopesOperations  # type: ignore
+from ._blob_services_operations import BlobServicesOperations  # type: ignore
+from ._blob_containers_operations import BlobContainersOperations  # type: ignore
+from ._file_services_operations import FileServicesOperations  # type: ignore
+from ._file_shares_operations import FileSharesOperations  # type: ignore
+from ._queue_services_operations import QueueServicesOperations  # type: ignore
+from ._queue_operations import QueueOperations  # type: ignore
+from ._table_services_operations import TableServicesOperations  # type: ignore
+from ._table_operations import TableOperations  # 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__ = [
@@ -53,5 +59,5 @@
     "TableServicesOperations",
     "TableOperations",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/operations/_blob_containers_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/operations/_blob_containers_operations.py
index 8bdad8379973..ddf0cd794b6a 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/operations/_blob_containers_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/operations/_blob_containers_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,7 @@
 # --------------------------------------------------------------------------
 from io import IOBase
 import sys
-from typing import Any, Callable, Dict, IO, Iterable, Literal, Optional, Type, TypeVar, Union, cast, overload
+from typing import Any, Callable, Dict, IO, Iterable, Iterator, Literal, Optional, TypeVar, Union, cast, overload
 import urllib.parse
 
 from azure.core.exceptions import (
@@ -17,13 +17,14 @@
     ResourceExistsError,
     ResourceNotFoundError,
     ResourceNotModifiedError,
+    StreamClosedError,
+    StreamConsumedError,
     map_error,
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
 from azure.core.polling import LROPoller, NoPolling, PollingMethod
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
@@ -31,12 +32,11 @@
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -649,7 +649,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-05-01"))
         cls: ClsType[_models.ListContainerItems] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -671,7 +671,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -687,7 +686,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -822,7 +820,7 @@ def create(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -857,7 +855,6 @@ def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -871,11 +868,7 @@ def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("BlobContainer", pipeline_response)
-
-        if response.status_code == 201:
-            deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -985,7 +978,7 @@ def update(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1020,7 +1013,6 @@ def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1034,7 +1026,7 @@ def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1063,7 +1055,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1086,7 +1078,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1100,7 +1091,7 @@ def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1129,7 +1120,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,
@@ -1152,7 +1143,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1275,7 +1265,7 @@ def set_legal_hold(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.LegalHold
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1310,7 +1300,6 @@ def set_legal_hold(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1324,7 +1313,7 @@ def set_legal_hold(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LegalHold", pipeline_response)
+        deserialized = self._deserialize("LegalHold", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1434,7 +1423,7 @@ def clear_legal_hold(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.LegalHold
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1469,7 +1458,6 @@ def clear_legal_hold(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1483,7 +1471,7 @@ def clear_legal_hold(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LegalHold", pipeline_response)
+        deserialized = self._deserialize("LegalHold", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1610,7 +1598,7 @@ def create_or_update_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1651,7 +1639,6 @@ def create_or_update_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1668,7 +1655,7 @@ def create_or_update_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1707,7 +1694,7 @@ def get_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1733,7 +1720,6 @@ def get_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1750,7 +1736,7 @@ def get_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1786,7 +1772,7 @@ def delete_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1812,7 +1798,6 @@ def delete_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1829,7 +1814,7 @@ def delete_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1863,7 +1848,7 @@ def lock_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1887,7 +1872,6 @@ def lock_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1904,7 +1888,7 @@ def lock_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -2034,7 +2018,7 @@ def extend_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -2073,7 +2057,6 @@ def extend_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -2090,7 +2073,7 @@ def extend_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -2200,7 +2183,7 @@ def lease(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.LeaseContainerResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -2238,7 +2221,6 @@ def lease(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -2252,17 +2234,17 @@ def lease(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LeaseContainerResponse", pipeline_response)
+        deserialized = self._deserialize("LeaseContainerResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
 
         return deserialized  # type: ignore
 
-    def _object_level_worm_initial(  # pylint: disable=inconsistent-return-statements
+    def _object_level_worm_initial(
         self, resource_group_name: str, account_name: str, container_name: str, **kwargs: Any
-    ) -> None:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> Iterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -2274,7 +2256,7 @@ def _object_level_worm_initial(  # pylint: disable=inconsistent-return-statement
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-05-01"))
-        cls: ClsType[None] = kwargs.pop("cls", None)
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
 
         _request = build_object_level_worm_request(
             resource_group_name=resource_group_name,
@@ -2285,10 +2267,10 @@ def _object_level_worm_initial(  # pylint: disable=inconsistent-return-statement
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -2296,11 +2278,19 @@ def _object_level_worm_initial(  # pylint: disable=inconsistent-return-statement
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
-            return cls(pipeline_response, None, {})  # type: ignore
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
 
     @distributed_trace
     def begin_object_level_worm(
@@ -2336,7 +2326,7 @@ def begin_object_level_worm(
         lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
         cont_token: Optional[str] = kwargs.pop("continuation_token", None)
         if cont_token is None:
-            raw_result = self._object_level_worm_initial(  # type: ignore
+            raw_result = self._object_level_worm_initial(
                 resource_group_name=resource_group_name,
                 account_name=account_name,
                 container_name=container_name,
@@ -2346,6 +2336,7 @@ def begin_object_level_worm(
                 params=_params,
                 **kwargs
             )
+            raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/operations/_blob_inventory_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/operations/_blob_inventory_policies_operations.py
index fb62d33ea7aa..0c488c36e1d0 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/operations/_blob_inventory_policies_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/operations/_blob_inventory_policies_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 (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -235,7 +232,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.BlobInventoryPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -258,7 +255,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -272,7 +268,7 @@ def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response)
+        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -376,7 +372,7 @@ def create_or_update(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.BlobInventoryPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -411,7 +407,6 @@ def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -425,7 +420,7 @@ def create_or_update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response)
+        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -457,7 +452,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,
@@ -480,7 +475,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -521,7 +515,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-05-01"))
         cls: ClsType[_models.ListBlobInventoryPolicy] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -540,7 +534,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -556,7 +549,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/operations/_blob_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/operations/_blob_services_operations.py
index 768c8f2a49b1..527943aed5f2 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/operations/_blob_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/operations/_blob_services_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, Literal, Optional, Type, TypeVar, Union, overload
+from typing import Any, Callable, Dict, IO, Iterable, Literal, Optional, TypeVar, Union, overload
 import urllib.parse
 
 from azure.core.exceptions import (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -191,7 +188,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-05-01"))
         cls: ClsType[_models.BlobServiceItems] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -210,7 +207,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -226,7 +222,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -343,7 +338,7 @@ def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.BlobServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -379,7 +374,6 @@ def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -393,7 +387,7 @@ def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobServiceProperties", pipeline_response)
+        deserialized = self._deserialize("BlobServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -418,7 +412,7 @@ def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.BlobServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -442,7 +436,6 @@ def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -456,7 +449,7 @@ def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobServiceProperties", pipeline_response)
+        deserialized = self._deserialize("BlobServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/operations/_deleted_accounts_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/operations/_deleted_accounts_operations.py
index 793bfce70601..aefad7271543 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/operations/_deleted_accounts_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/operations/_deleted_accounts_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 (
@@ -20,20 +19,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -130,7 +127,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.DeletedAccount"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-05-01"))
         cls: ClsType[_models.DeletedAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -147,7 +144,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -163,7 +159,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -205,7 +200,7 @@ def get(self, deleted_account_name: str, location: str, **kwargs: Any) -> _model
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.DeletedAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -227,7 +222,6 @@ def get(self, deleted_account_name: str, location: str, **kwargs: Any) -> _model
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -242,7 +236,7 @@ def get(self, deleted_account_name: str, location: str, **kwargs: Any) -> _model
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("DeletedAccount", pipeline_response)
+        deserialized = self._deserialize("DeletedAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/operations/_encryption_scopes_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/operations/_encryption_scopes_operations.py
index a693046c4031..5bbc349d8674 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/operations/_encryption_scopes_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/operations/_encryption_scopes_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 (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -315,7 +312,7 @@ def put(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.EncryptionScope
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -350,7 +347,6 @@ def put(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -365,11 +361,7 @@ def put(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("EncryptionScope", pipeline_response)
-
-        if response.status_code == 201:
-            deserialized = self._deserialize("EncryptionScope", pipeline_response)
+        deserialized = self._deserialize("EncryptionScope", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -479,7 +471,7 @@ def patch(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.EncryptionScope
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -514,7 +506,6 @@ def patch(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -529,7 +520,7 @@ def patch(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("EncryptionScope", pipeline_response)
+        deserialized = self._deserialize("EncryptionScope", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -558,7 +549,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.EncryptionScope
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -581,7 +572,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -596,7 +586,7 @@ def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("EncryptionScope", pipeline_response)
+        deserialized = self._deserialize("EncryptionScope", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -624,7 +614,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> It
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-05-01"))
         cls: ClsType[_models.EncryptionScopeListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -643,7 +633,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -659,7 +648,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/operations/_file_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/operations/_file_services_operations.py
index 4a234f3fb28e..732ba9eb8a34 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/operations/_file_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/operations/_file_services_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, Literal, Optional, Type, TypeVar, Union, overload
+from typing import Any, Callable, Dict, IO, Literal, Optional, TypeVar, Union, overload
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -19,20 +18,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -179,7 +176,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.FileServiceItems
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -201,7 +198,6 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -215,7 +211,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileServiceItems", pipeline_response)
+        deserialized = self._deserialize("FileServiceItems", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -310,7 +306,7 @@ def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.FileServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -346,7 +342,6 @@ def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -360,7 +355,7 @@ def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileServiceProperties", pipeline_response)
+        deserialized = self._deserialize("FileServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -385,7 +380,7 @@ def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.FileServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -409,7 +404,6 @@ def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -423,7 +417,7 @@ def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileServiceProperties", pipeline_response)
+        deserialized = self._deserialize("FileServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/operations/_file_shares_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/operations/_file_shares_operations.py
index 81509f7acb12..fff530043218 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/operations/_file_shares_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/operations/_file_shares_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,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 (
@@ -21,20 +21,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -401,7 +399,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-05-01"))
         cls: ClsType[_models.FileShareItems] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -423,7 +421,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -439,7 +436,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -586,7 +582,7 @@ def create(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.FileShare
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -622,7 +618,6 @@ def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -636,11 +631,7 @@ def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("FileShare", pipeline_response)
-
-        if response.status_code == 201:
-            deserialized = self._deserialize("FileShare", pipeline_response)
+        deserialized = self._deserialize("FileShare", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -750,7 +741,7 @@ def update(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.FileShare
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -785,7 +776,6 @@ def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -799,7 +789,7 @@ def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileShare", pipeline_response)
+        deserialized = self._deserialize("FileShare", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -840,7 +830,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.FileShare
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -865,7 +855,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -879,7 +868,7 @@ def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileShare", pipeline_response)
+        deserialized = self._deserialize("FileShare", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -924,7 +913,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,
@@ -949,7 +938,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -967,7 +955,7 @@ def delete(  # pylint: disable=inconsistent-return-statements
             return cls(pipeline_response, None, {})  # type: ignore
 
     @overload
-    def restore(  # pylint: disable=inconsistent-return-statements
+    def restore(
         self,
         resource_group_name: str,
         account_name: str,
@@ -1002,7 +990,7 @@ def restore(  # pylint: disable=inconsistent-return-statements
         """
 
     @overload
-    def restore(  # pylint: disable=inconsistent-return-statements
+    def restore(
         self,
         resource_group_name: str,
         account_name: str,
@@ -1065,7 +1053,7 @@ def restore(  # 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,
@@ -1100,7 +1088,6 @@ def restore(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1232,7 +1219,7 @@ def lease(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.LeaseShareResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1271,7 +1258,6 @@ def lease(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1288,7 +1274,7 @@ def lease(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("LeaseShareResponse", pipeline_response)
+        deserialized = self._deserialize("LeaseShareResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/operations/_local_users_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/operations/_local_users_operations.py
index 6a1eb2d305c5..7580815da5b7 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/operations/_local_users_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/operations/_local_users_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 (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -287,7 +284,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> It
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-05-01"))
         cls: ClsType[_models.LocalUsers] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -306,7 +303,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -322,7 +318,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -370,7 +365,7 @@ def get(self, resource_group_name: str, account_name: str, username: str, **kwar
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.LocalUser
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -393,7 +388,6 @@ def get(self, resource_group_name: str, account_name: str, username: str, **kwar
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -408,7 +402,7 @@ def get(self, resource_group_name: str, account_name: str, username: str, **kwar
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LocalUser", pipeline_response)
+        deserialized = self._deserialize("LocalUser", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -509,7 +503,7 @@ def create_or_update(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.LocalUser
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -544,7 +538,6 @@ def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -559,7 +552,7 @@ def create_or_update(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LocalUser", pipeline_response)
+        deserialized = self._deserialize("LocalUser", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -586,7 +579,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,
@@ -609,7 +602,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -647,7 +639,7 @@ def list_keys(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.LocalUserKeys
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -670,7 +662,6 @@ def list_keys(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -685,7 +676,7 @@ def list_keys(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LocalUserKeys", pipeline_response)
+        deserialized = self._deserialize("LocalUserKeys", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -712,7 +703,7 @@ def regenerate_password(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.LocalUserRegeneratePasswordResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -735,7 +726,6 @@ def regenerate_password(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -750,7 +740,7 @@ def regenerate_password(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LocalUserRegeneratePasswordResult", pipeline_response)
+        deserialized = self._deserialize("LocalUserRegeneratePasswordResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/operations/_management_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/operations/_management_policies_operations.py
index 0db22cc87ce9..8860dc87b2a0 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/operations/_management_policies_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/operations/_management_policies_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,
@@ -19,20 +18,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -196,7 +193,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.ManagementPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -219,7 +216,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -233,7 +229,7 @@ def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ManagementPolicy", pipeline_response)
+        deserialized = self._deserialize("ManagementPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -337,7 +333,7 @@ def create_or_update(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.ManagementPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -372,7 +368,6 @@ def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -386,7 +381,7 @@ def create_or_update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ManagementPolicy", pipeline_response)
+        deserialized = self._deserialize("ManagementPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -418,7 +413,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,
@@ -441,7 +436,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/operations/_object_replication_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/operations/_object_replication_policies_operations.py
index cf56b4ded764..b33304c5dfb6 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/operations/_object_replication_policies_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/operations/_object_replication_policies_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 (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -229,7 +226,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-05-01"))
         cls: ClsType[_models.ObjectReplicationPolicies] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -248,7 +245,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -264,7 +260,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -316,7 +311,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.ObjectReplicationPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -339,7 +334,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -354,7 +348,7 @@ def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response)
+        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -464,7 +458,7 @@ def create_or_update(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.ObjectReplicationPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -499,7 +493,6 @@ def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -514,7 +507,7 @@ def create_or_update(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response)
+        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -543,7 +536,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,
@@ -566,7 +559,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/operations/_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/operations/_operations.py
index 69bd85c2d459..8d94491047d0 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/operations/_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/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 (
@@ -20,20 +19,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -94,7 +91,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.Operation"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-05-01"))
         cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -110,7 +107,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -126,7 +122,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/operations/_private_endpoint_connections_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/operations/_private_endpoint_connections_operations.py
index aa88a9ff3b4e..31d0abb8a037 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/operations/_private_endpoint_connections_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/operations/_private_endpoint_connections_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 (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -241,7 +238,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-05-01"))
         cls: ClsType[_models.PrivateEndpointConnectionListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -260,7 +257,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -276,7 +272,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -325,7 +320,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.PrivateEndpointConnection
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -348,7 +343,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -363,7 +357,7 @@ def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response)
+        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -464,7 +458,7 @@ def put(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.PrivateEndpointConnection
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -499,7 +493,6 @@ def put(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -514,7 +507,7 @@ def put(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response)
+        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -541,7 +534,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,
@@ -564,7 +557,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/operations/_private_link_resources_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/operations/_private_link_resources_operations.py
index 4a0f3a0a27cd..998e8b70a803 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/operations/_private_link_resources_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/operations/_private_link_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, Optional, Type, TypeVar
+from typing import Any, Callable, Dict, Optional, TypeVar
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -18,20 +17,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -109,7 +106,7 @@ def list_by_storage_account(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.PrivateLinkResourceListResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -131,7 +128,6 @@ def list_by_storage_account(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -145,7 +141,7 @@ def list_by_storage_account(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("PrivateLinkResourceListResult", pipeline_response)
+        deserialized = self._deserialize("PrivateLinkResourceListResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/operations/_queue_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/operations/_queue_operations.py
index 387d49ea5472..19f6fc99495d 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/operations/_queue_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/operations/_queue_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 (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -375,7 +372,7 @@ def create(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.StorageQueue
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -410,7 +407,6 @@ def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -424,7 +420,7 @@ def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageQueue", pipeline_response)
+        deserialized = self._deserialize("StorageQueue", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -531,7 +527,7 @@ def update(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.StorageQueue
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -566,7 +562,6 @@ def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -580,7 +575,7 @@ def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageQueue", pipeline_response)
+        deserialized = self._deserialize("StorageQueue", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -607,7 +602,7 @@ def get(self, resource_group_name: str, account_name: str, queue_name: str, **kw
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.StorageQueue
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -630,7 +625,6 @@ def get(self, resource_group_name: str, account_name: str, queue_name: str, **kw
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -644,7 +638,7 @@ def get(self, resource_group_name: str, account_name: str, queue_name: str, **kw
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageQueue", pipeline_response)
+        deserialized = self._deserialize("StorageQueue", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -673,7 +667,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,
@@ -696,7 +690,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -747,7 +740,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-05-01"))
         cls: ClsType[_models.ListQueueResource] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -768,7 +761,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -784,7 +776,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/operations/_queue_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/operations/_queue_services_operations.py
index 50bff0091287..2aca25bc1bd3 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/operations/_queue_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/operations/_queue_services_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, Literal, Optional, Type, TypeVar, Union, overload
+from typing import Any, Callable, Dict, IO, Literal, Optional, TypeVar, Union, overload
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -19,20 +18,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -179,7 +176,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.ListQueueServices
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -201,7 +198,6 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -215,7 +211,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListQueueServices", pipeline_response)
+        deserialized = self._deserialize("ListQueueServices", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -310,7 +306,7 @@ def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.QueueServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -346,7 +342,6 @@ def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -360,7 +355,7 @@ def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("QueueServiceProperties", pipeline_response)
+        deserialized = self._deserialize("QueueServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -385,7 +380,7 @@ def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.QueueServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -409,7 +404,6 @@ def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -423,7 +417,7 @@ def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("QueueServiceProperties", pipeline_response)
+        deserialized = self._deserialize("QueueServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/operations/_skus_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/operations/_skus_operations.py
index 41e93c27fed0..d3ad82985f49 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/operations/_skus_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/operations/_skus_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 (
@@ -20,20 +19,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -99,7 +96,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.SkuInformation"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-05-01"))
         cls: ClsType[_models.StorageSkuListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -116,7 +113,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -132,7 +128,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/operations/_storage_accounts_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/operations/_storage_accounts_operations.py
index 88d17fc28878..761bf065adce 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/operations/_storage_accounts_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/operations/_storage_accounts_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,7 @@
 # --------------------------------------------------------------------------
 from io import IOBase
 import sys
-from typing import Any, Callable, Dict, IO, Iterable, Literal, Optional, Type, TypeVar, Union, cast, overload
+from typing import Any, Callable, Dict, IO, Iterable, Iterator, Literal, Optional, TypeVar, Union, cast, overload
 import urllib.parse
 
 from azure.core.exceptions import (
@@ -17,13 +17,14 @@
     ResourceExistsError,
     ResourceNotFoundError,
     ResourceNotModifiedError,
+    StreamClosedError,
+    StreamConsumedError,
     map_error,
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
 from azure.core.polling import LROPoller, NoPolling, PollingMethod
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
@@ -31,12 +32,11 @@
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -649,7 +649,7 @@ def check_name_availability(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.CheckNameAvailabilityResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -681,7 +681,6 @@ def check_name_availability(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -695,7 +694,7 @@ def check_name_availability(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response)
+        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -708,8 +707,8 @@ def _create_initial(
         account_name: str,
         parameters: Union[_models.StorageAccountCreateParameters, IO[bytes]],
         **kwargs: Any
-    ) -> Optional[_models.StorageAccount]:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> Iterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -722,7 +721,7 @@ def _create_initial(
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-05-01"))
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
-        cls: ClsType[Optional[_models.StorageAccount]] = kwargs.pop("cls", None)
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
         _json = None
@@ -743,10 +742,10 @@ def _create_initial(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -754,12 +753,14 @@ def _create_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = None
-        if response.status_code == 200:
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -882,10 +883,11 @@ def begin_create(
                 params=_params,
                 **kwargs
             )
+            raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+            deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
             if cls:
                 return cls(pipeline_response, deserialized, {})  # type: ignore
             return deserialized
@@ -924,7 +926,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,
@@ -946,7 +948,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -991,7 +992,7 @@ def get_properties(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1014,7 +1015,6 @@ def get_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1028,7 +1028,7 @@ def get_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1139,7 +1139,7 @@ def update(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1173,7 +1173,6 @@ def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1187,7 +1186,7 @@ def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1209,7 +1208,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.StorageAccount"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-05-01"))
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1226,7 +1225,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -1242,7 +1240,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -1289,7 +1286,7 @@ def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> Ite
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-05-01"))
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1307,7 +1304,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -1323,7 +1319,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -1373,7 +1368,7 @@ def list_keys(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.StorageAccountListKeysResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1396,7 +1391,6 @@ def list_keys(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1410,7 +1404,7 @@ def list_keys(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response)
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1504,7 +1498,7 @@ def regenerate_key(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.StorageAccountListKeysResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1538,7 +1532,6 @@ def regenerate_key(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1552,7 +1545,7 @@ def regenerate_key(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response)
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1643,7 +1636,7 @@ def list_account_sas(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.ListAccountSasResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1677,7 +1670,6 @@ def list_account_sas(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1691,7 +1683,7 @@ def list_account_sas(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListAccountSasResponse", pipeline_response)
+        deserialized = self._deserialize("ListAccountSasResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1780,7 +1772,7 @@ def list_service_sas(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.ListServiceSasResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1814,7 +1806,6 @@ def list_service_sas(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1828,17 +1819,15 @@ def list_service_sas(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListServiceSasResponse", pipeline_response)
+        deserialized = self._deserialize("ListServiceSasResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
 
         return deserialized  # type: ignore
 
-    def _failover_initial(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, **kwargs: Any
-    ) -> None:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    def _failover_initial(self, resource_group_name: str, account_name: str, **kwargs: Any) -> Iterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1850,7 +1839,7 @@ def _failover_initial(  # pylint: disable=inconsistent-return-statements
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-05-01"))
-        cls: ClsType[None] = kwargs.pop("cls", None)
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
 
         _request = build_failover_request(
             resource_group_name=resource_group_name,
@@ -1860,10 +1849,10 @@ def _failover_initial(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -1871,11 +1860,19 @@ def _failover_initial(  # pylint: disable=inconsistent-return-statements
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
-            return cls(pipeline_response, None, {})  # type: ignore
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
 
     @distributed_trace
     def begin_failover(self, resource_group_name: str, account_name: str, **kwargs: Any) -> LROPoller[None]:
@@ -1903,7 +1900,7 @@ def begin_failover(self, resource_group_name: str, account_name: str, **kwargs:
         lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
         cont_token: Optional[str] = kwargs.pop("continuation_token", None)
         if cont_token is None:
-            raw_result = self._failover_initial(  # type: ignore
+            raw_result = self._failover_initial(
                 resource_group_name=resource_group_name,
                 account_name=account_name,
                 api_version=api_version,
@@ -1912,6 +1909,7 @@ def begin_failover(self, resource_group_name: str, account_name: str, **kwargs:
                 params=_params,
                 **kwargs
             )
+            raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
@@ -1935,10 +1933,10 @@ def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-
             )
         return LROPoller[None](self._client, raw_result, get_long_running_output, polling_method)  # type: ignore
 
-    def _hierarchical_namespace_migration_initial(  # pylint: disable=inconsistent-return-statements,name-too-long
+    def _hierarchical_namespace_migration_initial(  # pylint: disable=name-too-long
         self, resource_group_name: str, account_name: str, request_type: str, **kwargs: Any
-    ) -> None:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> Iterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1950,7 +1948,7 @@ def _hierarchical_namespace_migration_initial(  # pylint: disable=inconsistent-r
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-05-01"))
-        cls: ClsType[None] = kwargs.pop("cls", None)
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
 
         _request = build_hierarchical_namespace_migration_request(
             resource_group_name=resource_group_name,
@@ -1961,10 +1959,10 @@ def _hierarchical_namespace_migration_initial(  # pylint: disable=inconsistent-r
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -1972,12 +1970,20 @@ def _hierarchical_namespace_migration_initial(  # pylint: disable=inconsistent-r
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
-            return cls(pipeline_response, None, {})  # type: ignore
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
 
     @distributed_trace
     def begin_hierarchical_namespace_migration(
@@ -2010,7 +2016,7 @@ def begin_hierarchical_namespace_migration(
         lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
         cont_token: Optional[str] = kwargs.pop("continuation_token", None)
         if cont_token is None:
-            raw_result = self._hierarchical_namespace_migration_initial(  # type: ignore
+            raw_result = self._hierarchical_namespace_migration_initial(
                 resource_group_name=resource_group_name,
                 account_name=account_name,
                 request_type=request_type,
@@ -2020,6 +2026,7 @@ def begin_hierarchical_namespace_migration(
                 params=_params,
                 **kwargs
             )
+            raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
@@ -2043,10 +2050,10 @@ def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-
             )
         return LROPoller[None](self._client, raw_result, get_long_running_output, polling_method)  # type: ignore
 
-    def _abort_hierarchical_namespace_migration_initial(  # pylint: disable=inconsistent-return-statements,name-too-long
+    def _abort_hierarchical_namespace_migration_initial(  # pylint: disable=name-too-long
         self, resource_group_name: str, account_name: str, **kwargs: Any
-    ) -> None:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> Iterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -2058,7 +2065,7 @@ def _abort_hierarchical_namespace_migration_initial(  # pylint: disable=inconsis
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-05-01"))
-        cls: ClsType[None] = kwargs.pop("cls", None)
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
 
         _request = build_abort_hierarchical_namespace_migration_request(
             resource_group_name=resource_group_name,
@@ -2068,10 +2075,10 @@ def _abort_hierarchical_namespace_migration_initial(  # pylint: disable=inconsis
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -2079,12 +2086,20 @@ def _abort_hierarchical_namespace_migration_initial(  # pylint: disable=inconsis
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
-            return cls(pipeline_response, None, {})  # type: ignore
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
 
     @distributed_trace
     def begin_abort_hierarchical_namespace_migration(  # pylint: disable=name-too-long
@@ -2112,7 +2127,7 @@ def begin_abort_hierarchical_namespace_migration(  # pylint: disable=name-too-lo
         lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
         cont_token: Optional[str] = kwargs.pop("continuation_token", None)
         if cont_token is None:
-            raw_result = self._abort_hierarchical_namespace_migration_initial(  # type: ignore
+            raw_result = self._abort_hierarchical_namespace_migration_initial(
                 resource_group_name=resource_group_name,
                 account_name=account_name,
                 api_version=api_version,
@@ -2121,6 +2136,7 @@ def begin_abort_hierarchical_namespace_migration(  # pylint: disable=name-too-lo
                 params=_params,
                 **kwargs
             )
+            raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
@@ -2150,8 +2166,8 @@ def _restore_blob_ranges_initial(
         account_name: str,
         parameters: Union[_models.BlobRestoreParameters, IO[bytes]],
         **kwargs: Any
-    ) -> _models.BlobRestoreStatus:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> Iterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -2164,7 +2180,7 @@ def _restore_blob_ranges_initial(
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-05-01"))
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
-        cls: ClsType[_models.BlobRestoreStatus] = kwargs.pop("cls", None)
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
         _json = None
@@ -2185,10 +2201,10 @@ def _restore_blob_ranges_initial(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -2196,14 +2212,14 @@ def _restore_blob_ranges_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response)
-
-        if response.status_code == 202:
-            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response)
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -2316,10 +2332,11 @@ def begin_restore_blob_ranges(
                 params=_params,
                 **kwargs
             )
+            raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):
-            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response)
+            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response.http_response)
             if cls:
                 return cls(pipeline_response, deserialized, {})  # type: ignore
             return deserialized
@@ -2360,7 +2377,7 @@ def revoke_user_delegation_keys(  # pylint: disable=inconsistent-return-statemen
         :rtype: None
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -2382,7 +2399,6 @@ def revoke_user_delegation_keys(  # pylint: disable=inconsistent-return-statemen
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/operations/_table_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/operations/_table_operations.py
index 1d8aece03a71..5f429cb5e110 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/operations/_table_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/operations/_table_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 (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -340,7 +337,7 @@ def create(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.Table
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -378,7 +375,6 @@ def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -392,7 +388,7 @@ def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("Table", pipeline_response)
+        deserialized = self._deserialize("Table", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -496,7 +492,7 @@ def update(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.Table
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -534,7 +530,6 @@ def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -548,7 +543,7 @@ def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("Table", pipeline_response)
+        deserialized = self._deserialize("Table", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -574,7 +569,7 @@ def get(self, resource_group_name: str, account_name: str, table_name: str, **kw
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.Table
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -597,7 +592,6 @@ def get(self, resource_group_name: str, account_name: str, table_name: str, **kw
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -611,7 +605,7 @@ def get(self, resource_group_name: str, account_name: str, table_name: str, **kw
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("Table", pipeline_response)
+        deserialized = self._deserialize("Table", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -639,7 +633,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,
@@ -662,7 +656,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -700,7 +693,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> It
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-05-01"))
         cls: ClsType[_models.ListTableResource] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -719,7 +712,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -735,7 +727,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/operations/_table_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/operations/_table_services_operations.py
index 21f1afb60297..60015c298721 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/operations/_table_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/operations/_table_services_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, Literal, Optional, Type, TypeVar, Union, overload
+from typing import Any, Callable, Dict, IO, Literal, Optional, TypeVar, Union, overload
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -19,20 +18,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -179,7 +176,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.ListTableServices
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -201,7 +198,6 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -215,7 +211,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListTableServices", pipeline_response)
+        deserialized = self._deserialize("ListTableServices", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -310,7 +306,7 @@ def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.TableServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -346,7 +342,6 @@ def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -360,7 +355,7 @@ def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("TableServiceProperties", pipeline_response)
+        deserialized = self._deserialize("TableServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -385,7 +380,7 @@ def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2022_05_01.models.TableServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -409,7 +404,6 @@ def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -423,7 +417,7 @@ def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("TableServiceProperties", pipeline_response)
+        deserialized = self._deserialize("TableServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/operations/_usages_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/operations/_usages_operations.py
index 386b96c60938..2d7138e92413 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/operations/_usages_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_05_01/operations/_usages_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 (
@@ -20,20 +19,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -105,7 +102,7 @@ def list_by_location(self, location: str, **kwargs: Any) -> Iterable["_models.Us
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-05-01"))
         cls: ClsType[_models.UsageListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -123,7 +120,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -139,7 +135,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/__init__.py
index a860a5c185c9..60980065e1ee 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/__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 ._storage_management_client import StorageManagementClient
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._storage_management_client import StorageManagementClient  # 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__ = [
     "StorageManagementClient",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/_configuration.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/_configuration.py
index 663c09473419..47262e93fe43 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/_configuration.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/_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 StorageManagementClientConfiguration:  # pylint: disable=too-many-instance-attributes,name-too-long
+class StorageManagementClientConfiguration:  # pylint: disable=too-many-instance-attributes
     """Configuration for StorageManagementClient.
 
     Note that all parameters used to create this instance are saved as instance
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/_metadata.json b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/_metadata.json
index 866808f02b2b..cc0ba7b244aa 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/_metadata.json
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/_metadata.json
@@ -10,8 +10,8 @@
         "azure_arm": true,
         "has_public_lro_operations": true,
         "client_side_validation": false,
-        "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"ARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementClientConfiguration\"], \".._serialization\": [\"Deserializer\", \"Serializer\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}}",
-        "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"AsyncARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"AsyncARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementClientConfiguration\"], \"..._serialization\": [\"Deserializer\", \"Serializer\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"]}}}"
+        "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"ARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementClientConfiguration\"], \".._serialization\": [\"Deserializer\", \"Serializer\"]}, \"stdlib\": {\"typing_extensions\": [\"Self\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}}",
+        "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"AsyncARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"AsyncARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementClientConfiguration\"], \"..._serialization\": [\"Deserializer\", \"Serializer\"]}, \"stdlib\": {\"typing_extensions\": [\"Self\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"]}}}"
     },
     "global_parameters": {
         "sync": {
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/_storage_management_client.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/_storage_management_client.py
index 15e6eaf7e927..f244d88c7c58 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/_storage_management_client.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/_storage_management_client.py
@@ -8,6 +8,7 @@
 
 from copy import deepcopy
 from typing import Any, TYPE_CHECKING
+from typing_extensions import Self
 
 from azure.core.pipeline import policies
 from azure.core.rest import HttpRequest, HttpResponse
@@ -41,11 +42,10 @@
 )
 
 if TYPE_CHECKING:
-    # pylint: disable=unused-import,ungrouped-imports
     from azure.core.credentials import TokenCredential
 
 
-class StorageManagementClient:  # pylint: disable=client-accepts-api-version-keyword,too-many-instance-attributes
+class StorageManagementClient:  # pylint: disable=too-many-instance-attributes
     """The Azure Storage Management API.
 
     :ivar operations: Operations operations
@@ -217,7 +217,7 @@ def _send_request(self, request: HttpRequest, *, stream: bool = False, **kwargs:
     def close(self) -> None:
         self._client.close()
 
-    def __enter__(self) -> "StorageManagementClient":
+    def __enter__(self) -> Self:
         self._client.__enter__()
         return self
 
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/_vendor.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/_vendor.py
deleted file mode 100644
index 0dafe0e287ff..000000000000
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/_vendor.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# --------------------------------------------------------------------------
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License. See License.txt in the project root for license information.
-# Code generated by Microsoft (R) AutoRest Code Generator.
-# Changes may cause incorrect behavior and will be lost if the code is regenerated.
-# --------------------------------------------------------------------------
-
-from azure.core.pipeline.transport import HttpRequest
-
-
-def _convert_request(request, files=None):
-    data = request.content if not files else None
-    request = HttpRequest(method=request.method, url=request.url, headers=request.headers, data=data)
-    if files:
-        request.set_formdata_body(files)
-    return request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/_version.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/_version.py
index 5a163c0afedc..e5754a47ce68 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/_version.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/_version.py
@@ -6,4 +6,4 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-VERSION = "21.2.1"
\ No newline at end of file
+VERSION = "1.0.0b1"
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/__init__.py
index a5c3d2414cfd..ee2b940bd4fc 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/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 ._storage_management_client import StorageManagementClient
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._storage_management_client import StorageManagementClient  # 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__ = [
     "StorageManagementClient",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/_configuration.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/_configuration.py
index 4c03fa880515..8161bb587f49 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/_configuration.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/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 StorageManagementClientConfiguration:  # pylint: disable=too-many-instance-attributes,name-too-long
+class StorageManagementClientConfiguration:  # pylint: disable=too-many-instance-attributes
     """Configuration for StorageManagementClient.
 
     Note that all parameters used to create this instance are saved as instance
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/_storage_management_client.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/_storage_management_client.py
index c4dc5717ca8c..64344c3c6ec0 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/_storage_management_client.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/_storage_management_client.py
@@ -8,6 +8,7 @@
 
 from copy import deepcopy
 from typing import Any, Awaitable, TYPE_CHECKING
+from typing_extensions import Self
 
 from azure.core.pipeline import policies
 from azure.core.rest import AsyncHttpResponse, HttpRequest
@@ -41,11 +42,10 @@
 )
 
 if TYPE_CHECKING:
-    # pylint: disable=unused-import,ungrouped-imports
     from azure.core.credentials_async import AsyncTokenCredential
 
 
-class StorageManagementClient:  # pylint: disable=client-accepts-api-version-keyword,too-many-instance-attributes
+class StorageManagementClient:  # pylint: disable=too-many-instance-attributes
     """The Azure Storage Management API.
 
     :ivar operations: Operations operations
@@ -222,7 +222,7 @@ def _send_request(
     async def close(self) -> None:
         await self._client.close()
 
-    async def __aenter__(self) -> "StorageManagementClient":
+    async def __aenter__(self) -> Self:
         await self._client.__aenter__()
         return self
 
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/operations/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/operations/__init__.py
index bbce85749d18..a0549517e087 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/operations/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/operations/__init__.py
@@ -5,30 +5,36 @@
 # 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 ._skus_operations import SkusOperations
-from ._storage_accounts_operations import StorageAccountsOperations
-from ._deleted_accounts_operations import DeletedAccountsOperations
-from ._usages_operations import UsagesOperations
-from ._management_policies_operations import ManagementPoliciesOperations
-from ._blob_inventory_policies_operations import BlobInventoryPoliciesOperations
-from ._private_endpoint_connections_operations import PrivateEndpointConnectionsOperations
-from ._private_link_resources_operations import PrivateLinkResourcesOperations
-from ._object_replication_policies_operations import ObjectReplicationPoliciesOperations
-from ._local_users_operations import LocalUsersOperations
-from ._encryption_scopes_operations import EncryptionScopesOperations
-from ._blob_services_operations import BlobServicesOperations
-from ._blob_containers_operations import BlobContainersOperations
-from ._file_services_operations import FileServicesOperations
-from ._file_shares_operations import FileSharesOperations
-from ._queue_services_operations import QueueServicesOperations
-from ._queue_operations import QueueOperations
-from ._table_services_operations import TableServicesOperations
-from ._table_operations import TableOperations
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._operations import Operations  # type: ignore
+from ._skus_operations import SkusOperations  # type: ignore
+from ._storage_accounts_operations import StorageAccountsOperations  # type: ignore
+from ._deleted_accounts_operations import DeletedAccountsOperations  # type: ignore
+from ._usages_operations import UsagesOperations  # type: ignore
+from ._management_policies_operations import ManagementPoliciesOperations  # type: ignore
+from ._blob_inventory_policies_operations import BlobInventoryPoliciesOperations  # type: ignore
+from ._private_endpoint_connections_operations import PrivateEndpointConnectionsOperations  # type: ignore
+from ._private_link_resources_operations import PrivateLinkResourcesOperations  # type: ignore
+from ._object_replication_policies_operations import ObjectReplicationPoliciesOperations  # type: ignore
+from ._local_users_operations import LocalUsersOperations  # type: ignore
+from ._encryption_scopes_operations import EncryptionScopesOperations  # type: ignore
+from ._blob_services_operations import BlobServicesOperations  # type: ignore
+from ._blob_containers_operations import BlobContainersOperations  # type: ignore
+from ._file_services_operations import FileServicesOperations  # type: ignore
+from ._file_shares_operations import FileSharesOperations  # type: ignore
+from ._queue_services_operations import QueueServicesOperations  # type: ignore
+from ._queue_operations import QueueOperations  # type: ignore
+from ._table_services_operations import TableServicesOperations  # type: ignore
+from ._table_operations import TableOperations  # 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__ = [
@@ -53,5 +59,5 @@
     "TableServicesOperations",
     "TableOperations",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/operations/_blob_containers_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/operations/_blob_containers_operations.py
index e69b535eeafd..676f0c50ed08 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/operations/_blob_containers_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/operations/_blob_containers_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,20 @@
 # --------------------------------------------------------------------------
 from io import IOBase
 import sys
-from typing import Any, AsyncIterable, Callable, Dict, IO, Literal, Optional, Type, TypeVar, Union, cast, overload
+from typing import (
+    Any,
+    AsyncIterable,
+    AsyncIterator,
+    Callable,
+    Dict,
+    IO,
+    Literal,
+    Optional,
+    TypeVar,
+    Union,
+    cast,
+    overload,
+)
 import urllib.parse
 
 from azure.core.async_paging import AsyncItemPaged, AsyncList
@@ -18,12 +31,13 @@
     ResourceExistsError,
     ResourceNotFoundError,
     ResourceNotModifiedError,
+    StreamClosedError,
+    StreamConsumedError,
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
 from azure.core.polling import AsyncLROPoller, AsyncNoPolling, AsyncPollingMethod
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
@@ -31,7 +45,6 @@
 from azure.mgmt.core.polling.async_arm_polling import AsyncARMPolling
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._blob_containers_operations import (
     build_clear_legal_hold_request,
     build_create_or_update_immutability_policy_request,
@@ -52,7 +65,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]]
 
@@ -117,7 +130,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-09-01"))
         cls: ClsType[_models.ListContainerItems] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -139,7 +152,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -155,7 +167,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -290,7 +301,7 @@ async def create(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -325,7 +336,6 @@ async def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -339,11 +349,7 @@ async def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("BlobContainer", pipeline_response)
-
-        if response.status_code == 201:
-            deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -453,7 +459,7 @@ async def update(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -488,7 +494,6 @@ async def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -502,7 +507,7 @@ async def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -531,7 +536,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -554,7 +559,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -568,7 +572,7 @@ async def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -576,9 +580,7 @@ async def get(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, container_name: str, **kwargs: Any
-    ) -> None:
+    async def delete(self, resource_group_name: str, account_name: str, container_name: str, **kwargs: Any) -> None:
         """Deletes specified container under its account.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -597,7 +599,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,
@@ -620,7 +622,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -743,7 +744,7 @@ async def set_legal_hold(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.LegalHold
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -778,7 +779,6 @@ async def set_legal_hold(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -792,7 +792,7 @@ async def set_legal_hold(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LegalHold", pipeline_response)
+        deserialized = self._deserialize("LegalHold", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -902,7 +902,7 @@ async def clear_legal_hold(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.LegalHold
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -937,7 +937,6 @@ async def clear_legal_hold(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -951,7 +950,7 @@ async def clear_legal_hold(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LegalHold", pipeline_response)
+        deserialized = self._deserialize("LegalHold", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1078,7 +1077,7 @@ async def create_or_update_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1119,7 +1118,6 @@ async def create_or_update_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1136,7 +1134,7 @@ async def create_or_update_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1175,7 +1173,7 @@ async def get_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1201,7 +1199,6 @@ async def get_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1218,7 +1215,7 @@ async def get_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1254,7 +1251,7 @@ async def delete_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1280,7 +1277,6 @@ async def delete_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1297,7 +1293,7 @@ async def delete_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1331,7 +1327,7 @@ async def lock_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1355,7 +1351,6 @@ async def lock_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1372,7 +1367,7 @@ async def lock_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1502,7 +1497,7 @@ async def extend_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1541,7 +1536,6 @@ async def extend_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1558,7 +1552,7 @@ async def extend_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1668,7 +1662,7 @@ async def lease(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.LeaseContainerResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1706,7 +1700,6 @@ async def lease(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1720,17 +1713,17 @@ async def lease(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LeaseContainerResponse", pipeline_response)
+        deserialized = self._deserialize("LeaseContainerResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
 
         return deserialized  # type: ignore
 
-    async def _object_level_worm_initial(  # pylint: disable=inconsistent-return-statements
+    async def _object_level_worm_initial(
         self, resource_group_name: str, account_name: str, container_name: str, **kwargs: Any
-    ) -> None:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1742,7 +1735,7 @@ async def _object_level_worm_initial(  # pylint: disable=inconsistent-return-sta
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-09-01"))
-        cls: ClsType[None] = kwargs.pop("cls", None)
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
 
         _request = build_object_level_worm_request(
             resource_group_name=resource_group_name,
@@ -1753,10 +1746,10 @@ async def _object_level_worm_initial(  # pylint: disable=inconsistent-return-sta
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -1764,11 +1757,19 @@ async def _object_level_worm_initial(  # pylint: disable=inconsistent-return-sta
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
-            return cls(pipeline_response, None, {})  # type: ignore
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
 
     @distributed_trace_async
     async def begin_object_level_worm(
@@ -1804,7 +1805,7 @@ async def begin_object_level_worm(
         lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
         cont_token: Optional[str] = kwargs.pop("continuation_token", None)
         if cont_token is None:
-            raw_result = await self._object_level_worm_initial(  # type: ignore
+            raw_result = await self._object_level_worm_initial(
                 resource_group_name=resource_group_name,
                 account_name=account_name,
                 container_name=container_name,
@@ -1814,6 +1815,7 @@ async def begin_object_level_worm(
                 params=_params,
                 **kwargs
             )
+            await raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/operations/_blob_inventory_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/operations/_blob_inventory_policies_operations.py
index 17831ebf898e..25e38deff2b6 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/operations/_blob_inventory_policies_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/operations/_blob_inventory_policies_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._blob_inventory_policies_operations import (
     build_create_or_update_request,
     build_delete_request,
@@ -40,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]]
 
@@ -90,7 +87,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.BlobInventoryPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -113,7 +110,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -127,7 +123,7 @@ async def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response)
+        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -231,7 +227,7 @@ async def create_or_update(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.BlobInventoryPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -266,7 +262,6 @@ async def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -280,7 +275,7 @@ async def create_or_update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response)
+        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -288,7 +283,7 @@ async def create_or_update(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
+    async def delete(
         self,
         resource_group_name: str,
         account_name: str,
@@ -312,7 +307,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,
@@ -335,7 +330,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -376,7 +370,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-09-01"))
         cls: ClsType[_models.ListBlobInventoryPolicy] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -395,7 +389,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -411,7 +404,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/operations/_blob_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/operations/_blob_services_operations.py
index 5f65efc5f746..b0d4f301fda2 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/operations/_blob_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/operations/_blob_services_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, Literal, Optional, Type, TypeVar, Union, overload
+from typing import Any, AsyncIterable, Callable, Dict, IO, Literal, Optional, TypeVar, Union, overload
 import urllib.parse
 
 from azure.core.async_paging import AsyncItemPaged, AsyncList
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._blob_services_operations import (
     build_get_service_properties_request,
     build_list_request,
@@ -39,7 +36,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 +86,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-09-01"))
         cls: ClsType[_models.BlobServiceItems] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -108,7 +105,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -124,7 +120,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -241,7 +236,7 @@ async def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.BlobServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -277,7 +272,6 @@ async def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -291,7 +285,7 @@ async def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobServiceProperties", pipeline_response)
+        deserialized = self._deserialize("BlobServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -316,7 +310,7 @@ async def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.BlobServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -340,7 +334,6 @@ async def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -354,7 +347,7 @@ async def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobServiceProperties", pipeline_response)
+        deserialized = self._deserialize("BlobServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/operations/_deleted_accounts_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/operations/_deleted_accounts_operations.py
index 2b0e47640500..6f9bd72e19a4 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/operations/_deleted_accounts_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/operations/_deleted_accounts_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
@@ -20,21 +19,19 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._deleted_accounts_operations import build_get_request, build_list_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
 
@@ -74,7 +71,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.DeletedAccount"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-09-01"))
         cls: ClsType[_models.DeletedAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -91,7 +88,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -107,7 +103,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -149,7 +144,7 @@ async def get(self, deleted_account_name: str, location: str, **kwargs: Any) ->
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.DeletedAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -171,7 +166,6 @@ async def get(self, deleted_account_name: str, location: str, **kwargs: Any) ->
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -186,7 +180,7 @@ async def get(self, deleted_account_name: str, location: str, **kwargs: Any) ->
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("DeletedAccount", pipeline_response)
+        deserialized = self._deserialize("DeletedAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/operations/_encryption_scopes_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/operations/_encryption_scopes_operations.py
index caac59cc09f4..bae623e9b794 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/operations/_encryption_scopes_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/operations/_encryption_scopes_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._encryption_scopes_operations import (
     build_get_request,
     build_list_request,
@@ -40,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]]
 
@@ -173,7 +170,7 @@ async def put(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.EncryptionScope
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -208,7 +205,6 @@ async def put(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -223,11 +219,7 @@ async def put(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("EncryptionScope", pipeline_response)
-
-        if response.status_code == 201:
-            deserialized = self._deserialize("EncryptionScope", pipeline_response)
+        deserialized = self._deserialize("EncryptionScope", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -337,7 +329,7 @@ async def patch(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.EncryptionScope
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -372,7 +364,6 @@ async def patch(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -387,7 +378,7 @@ async def patch(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("EncryptionScope", pipeline_response)
+        deserialized = self._deserialize("EncryptionScope", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -416,7 +407,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.EncryptionScope
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -439,7 +430,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -454,7 +444,7 @@ async def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("EncryptionScope", pipeline_response)
+        deserialized = self._deserialize("EncryptionScope", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -500,7 +490,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-09-01"))
         cls: ClsType[_models.EncryptionScopeListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -522,7 +512,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -538,7 +527,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/operations/_file_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/operations/_file_services_operations.py
index 6ce13d5a6331..9ece8a5f1276 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/operations/_file_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/operations/_file_services_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, Literal, Optional, Type, TypeVar, Union, overload
+from typing import Any, Callable, Dict, IO, Literal, Optional, TypeVar, Union, overload
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -19,14 +18,12 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._file_services_operations import (
     build_get_service_properties_request,
     build_list_request,
@@ -36,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]]
 
@@ -76,7 +73,7 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.FileServiceItems
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -98,7 +95,6 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -112,7 +108,7 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileServiceItems", pipeline_response)
+        deserialized = self._deserialize("FileServiceItems", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -207,7 +203,7 @@ async def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.FileServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -243,7 +239,6 @@ async def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -257,7 +252,7 @@ async def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileServiceProperties", pipeline_response)
+        deserialized = self._deserialize("FileServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -282,7 +277,7 @@ async def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.FileServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -306,7 +301,6 @@ async def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -320,7 +314,7 @@ async def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileServiceProperties", pipeline_response)
+        deserialized = self._deserialize("FileServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/operations/_file_shares_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/operations/_file_shares_operations.py
index 09dc046a559a..6fc4f05a93b2 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/operations/_file_shares_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/operations/_file_shares_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._file_shares_operations import (
     build_create_request,
     build_delete_request,
@@ -43,7 +40,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]]
 
@@ -108,7 +105,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-09-01"))
         cls: ClsType[_models.FileShareItems] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -130,7 +127,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -146,7 +142,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -293,7 +288,7 @@ async def create(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.FileShare
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -329,7 +324,6 @@ async def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -343,11 +337,7 @@ async def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("FileShare", pipeline_response)
-
-        if response.status_code == 201:
-            deserialized = self._deserialize("FileShare", pipeline_response)
+        deserialized = self._deserialize("FileShare", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -457,7 +447,7 @@ async def update(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.FileShare
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -492,7 +482,6 @@ async def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -506,7 +495,7 @@ async def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileShare", pipeline_response)
+        deserialized = self._deserialize("FileShare", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -547,7 +536,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.FileShare
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -572,7 +561,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -586,7 +574,7 @@ async def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileShare", pipeline_response)
+        deserialized = self._deserialize("FileShare", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -594,7 +582,7 @@ async def get(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
+    async def delete(
         self,
         resource_group_name: str,
         account_name: str,
@@ -631,7 +619,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,
@@ -656,7 +644,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -674,7 +661,7 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             return cls(pipeline_response, None, {})  # type: ignore
 
     @overload
-    async def restore(  # pylint: disable=inconsistent-return-statements
+    async def restore(
         self,
         resource_group_name: str,
         account_name: str,
@@ -709,7 +696,7 @@ async def restore(  # pylint: disable=inconsistent-return-statements
         """
 
     @overload
-    async def restore(  # pylint: disable=inconsistent-return-statements
+    async def restore(
         self,
         resource_group_name: str,
         account_name: str,
@@ -744,7 +731,7 @@ async def restore(  # pylint: disable=inconsistent-return-statements
         """
 
     @distributed_trace_async
-    async def restore(  # pylint: disable=inconsistent-return-statements
+    async def restore(
         self,
         resource_group_name: str,
         account_name: str,
@@ -772,7 +759,7 @@ async def restore(  # 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,
@@ -807,7 +794,6 @@ async def restore(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -939,7 +925,7 @@ async def lease(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.LeaseShareResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -978,7 +964,6 @@ async def lease(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -995,7 +980,7 @@ async def lease(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("LeaseShareResponse", pipeline_response)
+        deserialized = self._deserialize("LeaseShareResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/operations/_local_users_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/operations/_local_users_operations.py
index 524e4a9928eb..64f69257ae4f 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/operations/_local_users_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/operations/_local_users_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._local_users_operations import (
     build_create_or_update_request,
     build_delete_request,
@@ -42,7 +39,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 +86,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> As
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-09-01"))
         cls: ClsType[_models.LocalUsers] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -108,7 +105,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -124,7 +120,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -172,7 +167,7 @@ async def get(self, resource_group_name: str, account_name: str, username: str,
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.LocalUser
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -195,7 +190,6 @@ async def get(self, resource_group_name: str, account_name: str, username: str,
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -210,7 +204,7 @@ async def get(self, resource_group_name: str, account_name: str, username: str,
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LocalUser", pipeline_response)
+        deserialized = self._deserialize("LocalUser", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -311,7 +305,7 @@ async def create_or_update(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.LocalUser
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -346,7 +340,6 @@ async def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -361,7 +354,7 @@ async def create_or_update(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LocalUser", pipeline_response)
+        deserialized = self._deserialize("LocalUser", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -369,9 +362,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, account_name: str, username: str, **kwargs: Any
-    ) -> None:
+    async def delete(self, resource_group_name: str, account_name: str, username: str, **kwargs: Any) -> None:
         """Deletes the local user associated with the specified storage account.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -388,7 +379,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,
@@ -411,7 +402,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -449,7 +439,7 @@ async def list_keys(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.LocalUserKeys
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -472,7 +462,6 @@ async def list_keys(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -487,7 +476,7 @@ async def list_keys(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LocalUserKeys", pipeline_response)
+        deserialized = self._deserialize("LocalUserKeys", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -514,7 +503,7 @@ async def regenerate_password(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.LocalUserRegeneratePasswordResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -537,7 +526,6 @@ async def regenerate_password(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -552,7 +540,7 @@ async def regenerate_password(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LocalUserRegeneratePasswordResult", pipeline_response)
+        deserialized = self._deserialize("LocalUserRegeneratePasswordResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/operations/_management_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/operations/_management_policies_operations.py
index 0afaffcc28a4..d56c9ee27e13 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/operations/_management_policies_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/operations/_management_policies_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,
@@ -19,14 +18,12 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._management_policies_operations import (
     build_create_or_update_request,
     build_delete_request,
@@ -36,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]]
 
@@ -86,7 +83,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.ManagementPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -109,7 +106,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -123,7 +119,7 @@ async def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ManagementPolicy", pipeline_response)
+        deserialized = self._deserialize("ManagementPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -227,7 +223,7 @@ async def create_or_update(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.ManagementPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -262,7 +258,6 @@ async def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -276,7 +271,7 @@ async def create_or_update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ManagementPolicy", pipeline_response)
+        deserialized = self._deserialize("ManagementPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -284,7 +279,7 @@ async def create_or_update(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
+    async def delete(
         self,
         resource_group_name: str,
         account_name: str,
@@ -308,7 +303,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,
@@ -331,7 +326,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/operations/_object_replication_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/operations/_object_replication_policies_operations.py
index 5810275783fe..346db5108247 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/operations/_object_replication_policies_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/operations/_object_replication_policies_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._object_replication_policies_operations import (
     build_create_or_update_request,
     build_delete_request,
@@ -40,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]]
 
@@ -90,7 +87,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-09-01"))
         cls: ClsType[_models.ObjectReplicationPolicies] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -109,7 +106,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -125,7 +121,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -177,7 +172,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.ObjectReplicationPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -200,7 +195,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -215,7 +209,7 @@ async def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response)
+        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -325,7 +319,7 @@ async def create_or_update(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.ObjectReplicationPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -360,7 +354,6 @@ async def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -375,7 +368,7 @@ async def create_or_update(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response)
+        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -383,7 +376,7 @@ async def create_or_update(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
+    async def delete(
         self, resource_group_name: str, account_name: str, object_replication_policy_id: str, **kwargs: Any
     ) -> None:
         """Deletes the object replication policy associated with the specified storage account.
@@ -404,7 +397,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,
@@ -427,7 +420,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/operations/_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/operations/_operations.py
index f56ed4728f31..6b06e8050bcb 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/operations/_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/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
@@ -20,20 +19,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._operations import build_list_request
 
 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]]
 
@@ -73,7 +70,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.Operation"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-09-01"))
         cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -89,7 +86,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -105,7 +101,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/operations/_private_endpoint_connections_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/operations/_private_endpoint_connections_operations.py
index 224adfe0469c..dda97589923a 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/operations/_private_endpoint_connections_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/operations/_private_endpoint_connections_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._private_endpoint_connections_operations import (
     build_delete_request,
     build_get_request,
@@ -40,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]]
 
@@ -90,7 +87,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-09-01"))
         cls: ClsType[_models.PrivateEndpointConnectionListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -109,7 +106,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -125,7 +121,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -174,7 +169,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.PrivateEndpointConnection
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -197,7 +192,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -212,7 +206,7 @@ async def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response)
+        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -313,7 +307,7 @@ async def put(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.PrivateEndpointConnection
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -348,7 +342,6 @@ async def put(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -363,7 +356,7 @@ async def put(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response)
+        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -371,7 +364,7 @@ async def put(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
+    async def delete(
         self, resource_group_name: str, account_name: str, private_endpoint_connection_name: str, **kwargs: Any
     ) -> None:
         """Deletes the specified private endpoint connection associated with the storage account.
@@ -390,7 +383,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,
@@ -413,7 +406,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/operations/_private_link_resources_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/operations/_private_link_resources_operations.py
index df68dbf3f592..7ba7d577cdf3 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/operations/_private_link_resources_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/operations/_private_link_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, Optional, Type, TypeVar
+from typing import Any, Callable, Dict, Optional, TypeVar
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -18,20 +17,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._private_link_resources_operations import build_list_by_storage_account_request
 
 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]]
 
@@ -73,7 +70,7 @@ async def list_by_storage_account(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.PrivateLinkResourceListResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -95,7 +92,6 @@ async def list_by_storage_account(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -109,7 +105,7 @@ async def list_by_storage_account(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("PrivateLinkResourceListResult", pipeline_response)
+        deserialized = self._deserialize("PrivateLinkResourceListResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/operations/_queue_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/operations/_queue_operations.py
index f390424dd011..15095db4a799 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/operations/_queue_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/operations/_queue_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._queue_operations import (
     build_create_request,
     build_delete_request,
@@ -41,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]]
 
@@ -166,7 +163,7 @@ async def create(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.StorageQueue
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -201,7 +198,6 @@ async def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -215,7 +211,7 @@ async def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageQueue", pipeline_response)
+        deserialized = self._deserialize("StorageQueue", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -322,7 +318,7 @@ async def update(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.StorageQueue
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -357,7 +353,6 @@ async def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -371,7 +366,7 @@ async def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageQueue", pipeline_response)
+        deserialized = self._deserialize("StorageQueue", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -400,7 +395,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.StorageQueue
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -423,7 +418,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -437,7 +431,7 @@ async def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageQueue", pipeline_response)
+        deserialized = self._deserialize("StorageQueue", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -445,9 +439,7 @@ async def get(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, queue_name: str, **kwargs: Any
-    ) -> None:
+    async def delete(self, resource_group_name: str, account_name: str, queue_name: str, **kwargs: Any) -> None:
         """Deletes the queue with the specified queue name, under the specified account if it exists.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -466,7 +458,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,
@@ -489,7 +481,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -541,7 +532,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-09-01"))
         cls: ClsType[_models.ListQueueResource] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -562,7 +553,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -578,7 +568,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/operations/_queue_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/operations/_queue_services_operations.py
index 4712ca208346..621b54d50bbf 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/operations/_queue_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/operations/_queue_services_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, Literal, Optional, Type, TypeVar, Union, overload
+from typing import Any, Callable, Dict, IO, Literal, Optional, TypeVar, Union, overload
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -19,14 +18,12 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._queue_services_operations import (
     build_get_service_properties_request,
     build_list_request,
@@ -36,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]]
 
@@ -76,7 +73,7 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.ListQueueServices
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -98,7 +95,6 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -112,7 +108,7 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListQueueServices", pipeline_response)
+        deserialized = self._deserialize("ListQueueServices", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -207,7 +203,7 @@ async def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.QueueServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -243,7 +239,6 @@ async def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -257,7 +252,7 @@ async def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("QueueServiceProperties", pipeline_response)
+        deserialized = self._deserialize("QueueServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -282,7 +277,7 @@ async def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.QueueServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -306,7 +301,6 @@ async def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -320,7 +314,7 @@ async def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("QueueServiceProperties", pipeline_response)
+        deserialized = self._deserialize("QueueServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/operations/_skus_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/operations/_skus_operations.py
index c3f028152658..8b3457a131ce 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/operations/_skus_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/operations/_skus_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
@@ -20,20 +19,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._skus_operations import build_list_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
 
@@ -73,7 +70,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.SkuInformation"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-09-01"))
         cls: ClsType[_models.StorageSkuListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -90,7 +87,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -106,7 +102,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/operations/_storage_accounts_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/operations/_storage_accounts_operations.py
index 8a09b77ceae7..637537b01d13 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/operations/_storage_accounts_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/operations/_storage_accounts_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,20 @@
 # --------------------------------------------------------------------------
 from io import IOBase
 import sys
-from typing import Any, AsyncIterable, Callable, Dict, IO, Literal, Optional, Type, TypeVar, Union, cast, overload
+from typing import (
+    Any,
+    AsyncIterable,
+    AsyncIterator,
+    Callable,
+    Dict,
+    IO,
+    Literal,
+    Optional,
+    TypeVar,
+    Union,
+    cast,
+    overload,
+)
 import urllib.parse
 
 from azure.core.async_paging import AsyncItemPaged, AsyncList
@@ -18,12 +31,13 @@
     ResourceExistsError,
     ResourceNotFoundError,
     ResourceNotModifiedError,
+    StreamClosedError,
+    StreamConsumedError,
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
 from azure.core.polling import AsyncLROPoller, AsyncNoPolling, AsyncPollingMethod
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
@@ -31,7 +45,6 @@
 from azure.mgmt.core.polling.async_arm_polling import AsyncARMPolling
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._storage_accounts_operations import (
     build_abort_hierarchical_namespace_migration_request,
     build_check_name_availability_request,
@@ -54,7 +67,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]]
 
@@ -137,7 +150,7 @@ async def check_name_availability(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.CheckNameAvailabilityResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -169,7 +182,6 @@ async def check_name_availability(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -183,7 +195,7 @@ async def check_name_availability(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response)
+        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -196,8 +208,8 @@ async def _create_initial(
         account_name: str,
         parameters: Union[_models.StorageAccountCreateParameters, IO[bytes]],
         **kwargs: Any
-    ) -> Optional[_models.StorageAccount]:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -210,7 +222,7 @@ async def _create_initial(
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-09-01"))
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
-        cls: ClsType[Optional[_models.StorageAccount]] = kwargs.pop("cls", None)
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
         _json = None
@@ -231,10 +243,10 @@ async def _create_initial(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -242,12 +254,14 @@ async def _create_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = None
-        if response.status_code == 200:
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -373,10 +387,11 @@ async def begin_create(
                 params=_params,
                 **kwargs
             )
+            await raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+            deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
             if cls:
                 return cls(pipeline_response, deserialized, {})  # type: ignore
             return deserialized
@@ -399,9 +414,7 @@ def get_long_running_output(pipeline_response):
         )
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, **kwargs: Any
-    ) -> None:
+    async def delete(self, resource_group_name: str, account_name: str, **kwargs: Any) -> None:
         """Deletes a storage account in Microsoft Azure.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -415,7 +428,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,
@@ -437,7 +450,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -482,7 +494,7 @@ async def get_properties(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -505,7 +517,6 @@ async def get_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -519,7 +530,7 @@ async def get_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -630,7 +641,7 @@ async def update(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -664,7 +675,6 @@ async def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -678,7 +688,7 @@ async def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -701,7 +711,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.StorageAccount"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-09-01"))
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -718,7 +728,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -734,7 +743,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -784,7 +792,7 @@ def list_by_resource_group(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-09-01"))
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -802,7 +810,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -818,7 +825,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -868,7 +874,7 @@ async def list_keys(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.StorageAccountListKeysResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -891,7 +897,6 @@ async def list_keys(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -905,7 +910,7 @@ async def list_keys(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response)
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -999,7 +1004,7 @@ async def regenerate_key(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.StorageAccountListKeysResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1033,7 +1038,6 @@ async def regenerate_key(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1047,7 +1051,7 @@ async def regenerate_key(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response)
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1138,7 +1142,7 @@ async def list_account_sas(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.ListAccountSasResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1172,7 +1176,6 @@ async def list_account_sas(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1186,7 +1189,7 @@ async def list_account_sas(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListAccountSasResponse", pipeline_response)
+        deserialized = self._deserialize("ListAccountSasResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1275,7 +1278,7 @@ async def list_service_sas(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.ListServiceSasResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1309,7 +1312,6 @@ async def list_service_sas(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1323,17 +1325,17 @@ async def list_service_sas(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListServiceSasResponse", pipeline_response)
+        deserialized = self._deserialize("ListServiceSasResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
 
         return deserialized  # type: ignore
 
-    async def _failover_initial(  # pylint: disable=inconsistent-return-statements
+    async def _failover_initial(
         self, resource_group_name: str, account_name: str, failover_type: Literal["Planned"] = "Planned", **kwargs: Any
-    ) -> None:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1345,7 +1347,7 @@ async def _failover_initial(  # pylint: disable=inconsistent-return-statements
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-09-01"))
-        cls: ClsType[None] = kwargs.pop("cls", None)
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
 
         _request = build_failover_request(
             resource_group_name=resource_group_name,
@@ -1356,10 +1358,10 @@ async def _failover_initial(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -1367,11 +1369,19 @@ async def _failover_initial(  # pylint: disable=inconsistent-return-statements
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
-            return cls(pipeline_response, None, {})  # type: ignore
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
 
     @distributed_trace_async
     async def begin_failover(
@@ -1412,7 +1422,7 @@ async def begin_failover(
         lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
         cont_token: Optional[str] = kwargs.pop("continuation_token", None)
         if cont_token is None:
-            raw_result = await self._failover_initial(  # type: ignore
+            raw_result = await self._failover_initial(
                 resource_group_name=resource_group_name,
                 account_name=account_name,
                 failover_type=failover_type,
@@ -1422,6 +1432,7 @@ async def begin_failover(
                 params=_params,
                 **kwargs
             )
+            await raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
@@ -1445,10 +1456,10 @@ def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-
             )
         return AsyncLROPoller[None](self._client, raw_result, get_long_running_output, polling_method)  # type: ignore
 
-    async def _hierarchical_namespace_migration_initial(  # pylint: disable=inconsistent-return-statements,name-too-long
+    async def _hierarchical_namespace_migration_initial(  # pylint: disable=name-too-long
         self, resource_group_name: str, account_name: str, request_type: str, **kwargs: Any
-    ) -> None:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1460,7 +1471,7 @@ async def _hierarchical_namespace_migration_initial(  # pylint: disable=inconsis
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-09-01"))
-        cls: ClsType[None] = kwargs.pop("cls", None)
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
 
         _request = build_hierarchical_namespace_migration_request(
             resource_group_name=resource_group_name,
@@ -1471,10 +1482,10 @@ async def _hierarchical_namespace_migration_initial(  # pylint: disable=inconsis
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -1482,12 +1493,20 @@ async def _hierarchical_namespace_migration_initial(  # pylint: disable=inconsis
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
-            return cls(pipeline_response, None, {})  # type: ignore
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
 
     @distributed_trace_async
     async def begin_hierarchical_namespace_migration(
@@ -1520,7 +1539,7 @@ async def begin_hierarchical_namespace_migration(
         lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
         cont_token: Optional[str] = kwargs.pop("continuation_token", None)
         if cont_token is None:
-            raw_result = await self._hierarchical_namespace_migration_initial(  # type: ignore
+            raw_result = await self._hierarchical_namespace_migration_initial(
                 resource_group_name=resource_group_name,
                 account_name=account_name,
                 request_type=request_type,
@@ -1530,6 +1549,7 @@ async def begin_hierarchical_namespace_migration(
                 params=_params,
                 **kwargs
             )
+            await raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
@@ -1553,10 +1573,10 @@ def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-
             )
         return AsyncLROPoller[None](self._client, raw_result, get_long_running_output, polling_method)  # type: ignore
 
-    async def _abort_hierarchical_namespace_migration_initial(  # pylint: disable=inconsistent-return-statements,name-too-long
+    async def _abort_hierarchical_namespace_migration_initial(  # pylint: disable=name-too-long
         self, resource_group_name: str, account_name: str, **kwargs: Any
-    ) -> None:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1568,7 +1588,7 @@ async def _abort_hierarchical_namespace_migration_initial(  # pylint: disable=in
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-09-01"))
-        cls: ClsType[None] = kwargs.pop("cls", None)
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
 
         _request = build_abort_hierarchical_namespace_migration_request(
             resource_group_name=resource_group_name,
@@ -1578,10 +1598,10 @@ async def _abort_hierarchical_namespace_migration_initial(  # pylint: disable=in
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -1589,12 +1609,20 @@ async def _abort_hierarchical_namespace_migration_initial(  # pylint: disable=in
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
-            return cls(pipeline_response, None, {})  # type: ignore
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
 
     @distributed_trace_async
     async def begin_abort_hierarchical_namespace_migration(  # pylint: disable=name-too-long
@@ -1622,7 +1650,7 @@ async def begin_abort_hierarchical_namespace_migration(  # pylint: disable=name-
         lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
         cont_token: Optional[str] = kwargs.pop("continuation_token", None)
         if cont_token is None:
-            raw_result = await self._abort_hierarchical_namespace_migration_initial(  # type: ignore
+            raw_result = await self._abort_hierarchical_namespace_migration_initial(
                 resource_group_name=resource_group_name,
                 account_name=account_name,
                 api_version=api_version,
@@ -1631,6 +1659,7 @@ async def begin_abort_hierarchical_namespace_migration(  # pylint: disable=name-
                 params=_params,
                 **kwargs
             )
+            await raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
@@ -1660,8 +1689,8 @@ async def _restore_blob_ranges_initial(
         account_name: str,
         parameters: Union[_models.BlobRestoreParameters, IO[bytes]],
         **kwargs: Any
-    ) -> _models.BlobRestoreStatus:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1674,7 +1703,7 @@ async def _restore_blob_ranges_initial(
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-09-01"))
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
-        cls: ClsType[_models.BlobRestoreStatus] = kwargs.pop("cls", None)
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
         _json = None
@@ -1695,10 +1724,10 @@ async def _restore_blob_ranges_initial(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -1706,14 +1735,14 @@ async def _restore_blob_ranges_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response)
-
-        if response.status_code == 202:
-            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response)
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1829,10 +1858,11 @@ async def begin_restore_blob_ranges(
                 params=_params,
                 **kwargs
             )
+            await raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):
-            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response)
+            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response.http_response)
             if cls:
                 return cls(pipeline_response, deserialized, {})  # type: ignore
             return deserialized
@@ -1857,9 +1887,7 @@ def get_long_running_output(pipeline_response):
         )
 
     @distributed_trace_async
-    async def revoke_user_delegation_keys(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, **kwargs: Any
-    ) -> None:
+    async def revoke_user_delegation_keys(self, resource_group_name: str, account_name: str, **kwargs: Any) -> None:
         """Revoke user delegation keys.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -1873,7 +1901,7 @@ async def revoke_user_delegation_keys(  # pylint: disable=inconsistent-return-st
         :rtype: None
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1895,7 +1923,6 @@ async def revoke_user_delegation_keys(  # pylint: disable=inconsistent-return-st
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/operations/_table_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/operations/_table_operations.py
index 83a71daa17d8..c0cfcc41d371 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/operations/_table_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/operations/_table_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._table_operations import (
     build_create_request,
     build_delete_request,
@@ -41,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]]
 
@@ -163,7 +160,7 @@ async def create(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.Table
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -201,7 +198,6 @@ async def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -215,7 +211,7 @@ async def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("Table", pipeline_response)
+        deserialized = self._deserialize("Table", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -319,7 +315,7 @@ async def update(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.Table
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -357,7 +353,6 @@ async def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -371,7 +366,7 @@ async def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("Table", pipeline_response)
+        deserialized = self._deserialize("Table", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -397,7 +392,7 @@ async def get(self, resource_group_name: str, account_name: str, table_name: str
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.Table
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -420,7 +415,6 @@ async def get(self, resource_group_name: str, account_name: str, table_name: str
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -434,7 +428,7 @@ async def get(self, resource_group_name: str, account_name: str, table_name: str
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("Table", pipeline_response)
+        deserialized = self._deserialize("Table", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -442,9 +436,7 @@ async def get(self, resource_group_name: str, account_name: str, table_name: str
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, table_name: str, **kwargs: Any
-    ) -> None:
+    async def delete(self, resource_group_name: str, account_name: str, table_name: str, **kwargs: Any) -> None:
         """Deletes the table with the specified table name, under the specified account if it exists.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -462,7 +454,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,
@@ -485,7 +477,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -523,7 +514,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> As
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-09-01"))
         cls: ClsType[_models.ListTableResource] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -542,7 +533,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -558,7 +548,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/operations/_table_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/operations/_table_services_operations.py
index 0a5825a325b9..f81cbf874d41 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/operations/_table_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/operations/_table_services_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, Literal, Optional, Type, TypeVar, Union, overload
+from typing import Any, Callable, Dict, IO, Literal, Optional, TypeVar, Union, overload
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -19,14 +18,12 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._table_services_operations import (
     build_get_service_properties_request,
     build_list_request,
@@ -36,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]]
 
@@ -76,7 +73,7 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.ListTableServices
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -98,7 +95,6 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -112,7 +108,7 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListTableServices", pipeline_response)
+        deserialized = self._deserialize("ListTableServices", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -207,7 +203,7 @@ async def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.TableServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -243,7 +239,6 @@ async def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -257,7 +252,7 @@ async def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("TableServiceProperties", pipeline_response)
+        deserialized = self._deserialize("TableServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -282,7 +277,7 @@ async def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.TableServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -306,7 +301,6 @@ async def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -320,7 +314,7 @@ async def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("TableServiceProperties", pipeline_response)
+        deserialized = self._deserialize("TableServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/operations/_usages_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/operations/_usages_operations.py
index 6caeb1a5af5b..8a19c7c5b1b6 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/operations/_usages_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/aio/operations/_usages_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
@@ -20,20 +19,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._usages_operations import build_list_by_location_request
 
 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 +72,7 @@ def list_by_location(self, location: str, **kwargs: Any) -> AsyncIterable["_mode
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-09-01"))
         cls: ClsType[_models.UsageListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -93,7 +90,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -109,7 +105,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/models/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/models/__init__.py
index 599c5f794607..9a92a1244148 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/models/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/models/__init__.py
@@ -5,223 +5,234 @@
 # 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 AccessPolicy
-from ._models_py3 import AccountImmutabilityPolicyProperties
-from ._models_py3 import AccountSasParameters
-from ._models_py3 import ActiveDirectoryProperties
-from ._models_py3 import AzureEntityResource
-from ._models_py3 import AzureFilesIdentityBasedAuthentication
-from ._models_py3 import BlobContainer
-from ._models_py3 import BlobInventoryPolicy
-from ._models_py3 import BlobInventoryPolicyDefinition
-from ._models_py3 import BlobInventoryPolicyFilter
-from ._models_py3 import BlobInventoryPolicyRule
-from ._models_py3 import BlobInventoryPolicySchema
-from ._models_py3 import BlobRestoreParameters
-from ._models_py3 import BlobRestoreRange
-from ._models_py3 import BlobRestoreStatus
-from ._models_py3 import BlobServiceItems
-from ._models_py3 import BlobServiceProperties
-from ._models_py3 import ChangeFeed
-from ._models_py3 import CheckNameAvailabilityResult
-from ._models_py3 import CloudErrorBody
-from ._models_py3 import CorsRule
-from ._models_py3 import CorsRules
-from ._models_py3 import CustomDomain
-from ._models_py3 import DateAfterCreation
-from ._models_py3 import DateAfterModification
-from ._models_py3 import DeleteRetentionPolicy
-from ._models_py3 import DeletedAccount
-from ._models_py3 import DeletedAccountListResult
-from ._models_py3 import DeletedShare
-from ._models_py3 import Dimension
-from ._models_py3 import Encryption
-from ._models_py3 import EncryptionIdentity
-from ._models_py3 import EncryptionScope
-from ._models_py3 import EncryptionScopeKeyVaultProperties
-from ._models_py3 import EncryptionScopeListResult
-from ._models_py3 import EncryptionService
-from ._models_py3 import EncryptionServices
-from ._models_py3 import Endpoints
-from ._models_py3 import ErrorResponse
-from ._models_py3 import ErrorResponseBody
-from ._models_py3 import ExtendedLocation
-from ._models_py3 import FileServiceItems
-from ._models_py3 import FileServiceProperties
-from ._models_py3 import FileShare
-from ._models_py3 import FileShareItem
-from ._models_py3 import FileShareItems
-from ._models_py3 import GeoReplicationStats
-from ._models_py3 import IPRule
-from ._models_py3 import Identity
-from ._models_py3 import ImmutabilityPolicy
-from ._models_py3 import ImmutabilityPolicyProperties
-from ._models_py3 import ImmutableStorageAccount
-from ._models_py3 import ImmutableStorageWithVersioning
-from ._models_py3 import KeyCreationTime
-from ._models_py3 import KeyPolicy
-from ._models_py3 import KeyVaultProperties
-from ._models_py3 import LastAccessTimeTrackingPolicy
-from ._models_py3 import LeaseContainerRequest
-from ._models_py3 import LeaseContainerResponse
-from ._models_py3 import LeaseShareRequest
-from ._models_py3 import LeaseShareResponse
-from ._models_py3 import LegalHold
-from ._models_py3 import LegalHoldProperties
-from ._models_py3 import ListAccountSasResponse
-from ._models_py3 import ListBlobInventoryPolicy
-from ._models_py3 import ListContainerItem
-from ._models_py3 import ListContainerItems
-from ._models_py3 import ListQueue
-from ._models_py3 import ListQueueResource
-from ._models_py3 import ListQueueServices
-from ._models_py3 import ListServiceSasResponse
-from ._models_py3 import ListTableResource
-from ._models_py3 import ListTableServices
-from ._models_py3 import LocalUser
-from ._models_py3 import LocalUserKeys
-from ._models_py3 import LocalUserRegeneratePasswordResult
-from ._models_py3 import LocalUsers
-from ._models_py3 import ManagementPolicy
-from ._models_py3 import ManagementPolicyAction
-from ._models_py3 import ManagementPolicyBaseBlob
-from ._models_py3 import ManagementPolicyDefinition
-from ._models_py3 import ManagementPolicyFilter
-from ._models_py3 import ManagementPolicyRule
-from ._models_py3 import ManagementPolicySchema
-from ._models_py3 import ManagementPolicySnapShot
-from ._models_py3 import ManagementPolicyVersion
-from ._models_py3 import MetricSpecification
-from ._models_py3 import Multichannel
-from ._models_py3 import NetworkRuleSet
-from ._models_py3 import ObjectReplicationPolicies
-from ._models_py3 import ObjectReplicationPolicy
-from ._models_py3 import ObjectReplicationPolicyFilter
-from ._models_py3 import ObjectReplicationPolicyRule
-from ._models_py3 import Operation
-from ._models_py3 import OperationDisplay
-from ._models_py3 import OperationListResult
-from ._models_py3 import PermissionScope
-from ._models_py3 import PrivateEndpoint
-from ._models_py3 import PrivateEndpointConnection
-from ._models_py3 import PrivateEndpointConnectionListResult
-from ._models_py3 import PrivateLinkResource
-from ._models_py3 import PrivateLinkResourceListResult
-from ._models_py3 import PrivateLinkServiceConnectionState
-from ._models_py3 import ProtectedAppendWritesHistory
-from ._models_py3 import ProtocolSettings
-from ._models_py3 import ProxyResource
-from ._models_py3 import QueueServiceProperties
-from ._models_py3 import Resource
-from ._models_py3 import ResourceAccessRule
-from ._models_py3 import RestorePolicyProperties
-from ._models_py3 import Restriction
-from ._models_py3 import RoutingPreference
-from ._models_py3 import SKUCapability
-from ._models_py3 import SasPolicy
-from ._models_py3 import ServiceSasParameters
-from ._models_py3 import ServiceSpecification
-from ._models_py3 import SignedIdentifier
-from ._models_py3 import Sku
-from ._models_py3 import SkuInformation
-from ._models_py3 import SmbSetting
-from ._models_py3 import SshPublicKey
-from ._models_py3 import StorageAccount
-from ._models_py3 import StorageAccountCheckNameAvailabilityParameters
-from ._models_py3 import StorageAccountCreateParameters
-from ._models_py3 import StorageAccountInternetEndpoints
-from ._models_py3 import StorageAccountKey
-from ._models_py3 import StorageAccountListKeysResult
-from ._models_py3 import StorageAccountListResult
-from ._models_py3 import StorageAccountMicrosoftEndpoints
-from ._models_py3 import StorageAccountRegenerateKeyParameters
-from ._models_py3 import StorageAccountSkuConversionStatus
-from ._models_py3 import StorageAccountUpdateParameters
-from ._models_py3 import StorageQueue
-from ._models_py3 import StorageSkuListResult
-from ._models_py3 import SystemData
-from ._models_py3 import Table
-from ._models_py3 import TableAccessPolicy
-from ._models_py3 import TableServiceProperties
-from ._models_py3 import TableSignedIdentifier
-from ._models_py3 import TagFilter
-from ._models_py3 import TagProperty
-from ._models_py3 import TrackedResource
-from ._models_py3 import UpdateHistoryProperty
-from ._models_py3 import Usage
-from ._models_py3 import UsageListResult
-from ._models_py3 import UsageName
-from ._models_py3 import UserAssignedIdentity
-from ._models_py3 import VirtualNetworkRule
+from typing import TYPE_CHECKING
 
-from ._storage_management_client_enums import AccessTier
-from ._storage_management_client_enums import AccountImmutabilityPolicyState
-from ._storage_management_client_enums import AccountStatus
-from ._storage_management_client_enums import AccountType
-from ._storage_management_client_enums import AllowedCopyScope
-from ._storage_management_client_enums import AllowedMethods
-from ._storage_management_client_enums import BlobInventoryPolicyName
-from ._storage_management_client_enums import BlobRestoreProgressStatus
-from ._storage_management_client_enums import Bypass
-from ._storage_management_client_enums import CreatedByType
-from ._storage_management_client_enums import DefaultAction
-from ._storage_management_client_enums import DefaultSharePermission
-from ._storage_management_client_enums import DirectoryServiceOptions
-from ._storage_management_client_enums import DnsEndpointType
-from ._storage_management_client_enums import EnabledProtocols
-from ._storage_management_client_enums import EncryptionScopeSource
-from ._storage_management_client_enums import EncryptionScopeState
-from ._storage_management_client_enums import ExpirationAction
-from ._storage_management_client_enums import ExtendedLocationTypes
-from ._storage_management_client_enums import Format
-from ._storage_management_client_enums import GeoReplicationStatus
-from ._storage_management_client_enums import HttpProtocol
-from ._storage_management_client_enums import IdentityType
-from ._storage_management_client_enums import ImmutabilityPolicyState
-from ._storage_management_client_enums import ImmutabilityPolicyUpdateType
-from ._storage_management_client_enums import InventoryRuleType
-from ._storage_management_client_enums import KeyPermission
-from ._storage_management_client_enums import KeySource
-from ._storage_management_client_enums import KeyType
-from ._storage_management_client_enums import Kind
-from ._storage_management_client_enums import LargeFileSharesState
-from ._storage_management_client_enums import LeaseContainerRequestEnum
-from ._storage_management_client_enums import LeaseDuration
-from ._storage_management_client_enums import LeaseShareAction
-from ._storage_management_client_enums import LeaseState
-from ._storage_management_client_enums import LeaseStatus
-from ._storage_management_client_enums import ListContainersInclude
-from ._storage_management_client_enums import ListEncryptionScopesInclude
-from ._storage_management_client_enums import ManagementPolicyName
-from ._storage_management_client_enums import MigrationState
-from ._storage_management_client_enums import MinimumTlsVersion
-from ._storage_management_client_enums import Name
-from ._storage_management_client_enums import ObjectType
-from ._storage_management_client_enums import Permissions
-from ._storage_management_client_enums import PrivateEndpointConnectionProvisioningState
-from ._storage_management_client_enums import PrivateEndpointServiceConnectionStatus
-from ._storage_management_client_enums import ProvisioningState
-from ._storage_management_client_enums import PublicAccess
-from ._storage_management_client_enums import PublicNetworkAccess
-from ._storage_management_client_enums import Reason
-from ._storage_management_client_enums import ReasonCode
-from ._storage_management_client_enums import RootSquashType
-from ._storage_management_client_enums import RoutingChoice
-from ._storage_management_client_enums import RuleType
-from ._storage_management_client_enums import Schedule
-from ._storage_management_client_enums import Services
-from ._storage_management_client_enums import ShareAccessTier
-from ._storage_management_client_enums import SignedResource
-from ._storage_management_client_enums import SignedResourceTypes
-from ._storage_management_client_enums import SkuConversionStatus
-from ._storage_management_client_enums import SkuName
-from ._storage_management_client_enums import SkuTier
-from ._storage_management_client_enums import State
-from ._storage_management_client_enums import StorageAccountExpand
-from ._storage_management_client_enums import UsageUnit
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+
+from ._models_py3 import (  # type: ignore
+    AccessPolicy,
+    AccountImmutabilityPolicyProperties,
+    AccountSasParameters,
+    ActiveDirectoryProperties,
+    AzureEntityResource,
+    AzureFilesIdentityBasedAuthentication,
+    BlobContainer,
+    BlobInventoryPolicy,
+    BlobInventoryPolicyDefinition,
+    BlobInventoryPolicyFilter,
+    BlobInventoryPolicyRule,
+    BlobInventoryPolicySchema,
+    BlobRestoreParameters,
+    BlobRestoreRange,
+    BlobRestoreStatus,
+    BlobServiceItems,
+    BlobServiceProperties,
+    ChangeFeed,
+    CheckNameAvailabilityResult,
+    CloudErrorBody,
+    CorsRule,
+    CorsRules,
+    CustomDomain,
+    DateAfterCreation,
+    DateAfterModification,
+    DeleteRetentionPolicy,
+    DeletedAccount,
+    DeletedAccountListResult,
+    DeletedShare,
+    Dimension,
+    Encryption,
+    EncryptionIdentity,
+    EncryptionScope,
+    EncryptionScopeKeyVaultProperties,
+    EncryptionScopeListResult,
+    EncryptionService,
+    EncryptionServices,
+    Endpoints,
+    ErrorResponse,
+    ErrorResponseBody,
+    ExtendedLocation,
+    FileServiceItems,
+    FileServiceProperties,
+    FileShare,
+    FileShareItem,
+    FileShareItems,
+    GeoReplicationStats,
+    IPRule,
+    Identity,
+    ImmutabilityPolicy,
+    ImmutabilityPolicyProperties,
+    ImmutableStorageAccount,
+    ImmutableStorageWithVersioning,
+    KeyCreationTime,
+    KeyPolicy,
+    KeyVaultProperties,
+    LastAccessTimeTrackingPolicy,
+    LeaseContainerRequest,
+    LeaseContainerResponse,
+    LeaseShareRequest,
+    LeaseShareResponse,
+    LegalHold,
+    LegalHoldProperties,
+    ListAccountSasResponse,
+    ListBlobInventoryPolicy,
+    ListContainerItem,
+    ListContainerItems,
+    ListQueue,
+    ListQueueResource,
+    ListQueueServices,
+    ListServiceSasResponse,
+    ListTableResource,
+    ListTableServices,
+    LocalUser,
+    LocalUserKeys,
+    LocalUserRegeneratePasswordResult,
+    LocalUsers,
+    ManagementPolicy,
+    ManagementPolicyAction,
+    ManagementPolicyBaseBlob,
+    ManagementPolicyDefinition,
+    ManagementPolicyFilter,
+    ManagementPolicyRule,
+    ManagementPolicySchema,
+    ManagementPolicySnapShot,
+    ManagementPolicyVersion,
+    MetricSpecification,
+    Multichannel,
+    NetworkRuleSet,
+    ObjectReplicationPolicies,
+    ObjectReplicationPolicy,
+    ObjectReplicationPolicyFilter,
+    ObjectReplicationPolicyRule,
+    Operation,
+    OperationDisplay,
+    OperationListResult,
+    PermissionScope,
+    PrivateEndpoint,
+    PrivateEndpointConnection,
+    PrivateEndpointConnectionListResult,
+    PrivateLinkResource,
+    PrivateLinkResourceListResult,
+    PrivateLinkServiceConnectionState,
+    ProtectedAppendWritesHistory,
+    ProtocolSettings,
+    ProxyResource,
+    QueueServiceProperties,
+    Resource,
+    ResourceAccessRule,
+    RestorePolicyProperties,
+    Restriction,
+    RoutingPreference,
+    SKUCapability,
+    SasPolicy,
+    ServiceSasParameters,
+    ServiceSpecification,
+    SignedIdentifier,
+    Sku,
+    SkuInformation,
+    SmbSetting,
+    SshPublicKey,
+    StorageAccount,
+    StorageAccountCheckNameAvailabilityParameters,
+    StorageAccountCreateParameters,
+    StorageAccountInternetEndpoints,
+    StorageAccountKey,
+    StorageAccountListKeysResult,
+    StorageAccountListResult,
+    StorageAccountMicrosoftEndpoints,
+    StorageAccountRegenerateKeyParameters,
+    StorageAccountSkuConversionStatus,
+    StorageAccountUpdateParameters,
+    StorageQueue,
+    StorageSkuListResult,
+    SystemData,
+    Table,
+    TableAccessPolicy,
+    TableServiceProperties,
+    TableSignedIdentifier,
+    TagFilter,
+    TagProperty,
+    TrackedResource,
+    UpdateHistoryProperty,
+    Usage,
+    UsageListResult,
+    UsageName,
+    UserAssignedIdentity,
+    VirtualNetworkRule,
+)
+
+from ._storage_management_client_enums import (  # type: ignore
+    AccessTier,
+    AccountImmutabilityPolicyState,
+    AccountStatus,
+    AccountType,
+    AllowedCopyScope,
+    AllowedMethods,
+    BlobInventoryPolicyName,
+    BlobRestoreProgressStatus,
+    Bypass,
+    CreatedByType,
+    DefaultAction,
+    DefaultSharePermission,
+    DirectoryServiceOptions,
+    DnsEndpointType,
+    EnabledProtocols,
+    EncryptionScopeSource,
+    EncryptionScopeState,
+    ExpirationAction,
+    ExtendedLocationTypes,
+    Format,
+    GeoReplicationStatus,
+    HttpProtocol,
+    IdentityType,
+    ImmutabilityPolicyState,
+    ImmutabilityPolicyUpdateType,
+    InventoryRuleType,
+    KeyPermission,
+    KeySource,
+    KeyType,
+    Kind,
+    LargeFileSharesState,
+    LeaseContainerRequestEnum,
+    LeaseDuration,
+    LeaseShareAction,
+    LeaseState,
+    LeaseStatus,
+    ListContainersInclude,
+    ListEncryptionScopesInclude,
+    ManagementPolicyName,
+    MigrationState,
+    MinimumTlsVersion,
+    Name,
+    ObjectType,
+    Permissions,
+    PrivateEndpointConnectionProvisioningState,
+    PrivateEndpointServiceConnectionStatus,
+    ProvisioningState,
+    PublicAccess,
+    PublicNetworkAccess,
+    Reason,
+    ReasonCode,
+    RootSquashType,
+    RoutingChoice,
+    RuleType,
+    Schedule,
+    Services,
+    ShareAccessTier,
+    SignedResource,
+    SignedResourceTypes,
+    SkuConversionStatus,
+    SkuName,
+    SkuTier,
+    State,
+    StorageAccountExpand,
+    UsageUnit,
+)
 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__ = [
@@ -439,5 +450,5 @@
     "StorageAccountExpand",
     "UsageUnit",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/models/_models_py3.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/models/_models_py3.py
index 15ccd86cf684..c871a5028a2a 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/models/_models_py3.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/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
 
 
@@ -440,7 +439,7 @@ def __init__(
         self.default_share_permission = default_share_permission
 
 
-class BlobContainer(AzureEntityResource):  # pylint: disable=too-many-instance-attributes
+class BlobContainer(AzureEntityResource):
     """Properties of the blob container, including Id, resource name, resource type, Etag.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -1107,7 +1106,7 @@ def __init__(self, **kwargs: Any) -> None:
         self.value = None
 
 
-class BlobServiceProperties(Resource):  # pylint: disable=too-many-instance-attributes
+class BlobServiceProperties(Resource):
     """The properties of a storage account’s Blob service.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -2420,7 +2419,7 @@ def __init__(
         self.protocol_settings = protocol_settings
 
 
-class FileShare(AzureEntityResource):  # pylint: disable=too-many-instance-attributes
+class FileShare(AzureEntityResource):
     """Properties of the file share, including Id, resource name, resource type, Etag.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -2578,7 +2577,7 @@ def __init__(
         self.snapshot_time = None
 
 
-class FileShareItem(AzureEntityResource):  # pylint: disable=too-many-instance-attributes
+class FileShareItem(AzureEntityResource):
     """The file share properties be listed out.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -3342,7 +3341,7 @@ class LeaseContainerRequest(_serialization.Model):
     All required parameters must be populated in order to send to server.
 
     :ivar action: Specifies the lease action. Can be one of the available actions. Required. Known
-     values are: "Acquire", "Renew", "Change", "Release", and "Break".
+     values are: "Acquire", "Renew", "Change", "Release", "Break", and "Break".
     :vartype action: str or ~azure.mgmt.storage.v2022_09_01.models.LeaseContainerRequestEnum
     :ivar lease_id: Identifies the lease. Can be specified in any valid GUID string format.
     :vartype lease_id: str
@@ -3381,7 +3380,7 @@ def __init__(
     ) -> None:
         """
         :keyword action: Specifies the lease action. Can be one of the available actions. Required.
-         Known values are: "Acquire", "Renew", "Change", "Release", and "Break".
+         Known values are: "Acquire", "Renew", "Change", "Release", "Break", and "Break".
         :paramtype action: str or ~azure.mgmt.storage.v2022_09_01.models.LeaseContainerRequestEnum
         :keyword lease_id: Identifies the lease. Can be specified in any valid GUID string format.
         :paramtype lease_id: str
@@ -3439,7 +3438,7 @@ class LeaseShareRequest(_serialization.Model):
     All required parameters must be populated in order to send to server.
 
     :ivar action: Specifies the lease action. Can be one of the available actions. Required. Known
-     values are: "Acquire", "Renew", "Change", "Release", and "Break".
+     values are: "Acquire", "Renew", "Change", "Release", "Break", and "Break".
     :vartype action: str or ~azure.mgmt.storage.v2022_09_01.models.LeaseShareAction
     :ivar lease_id: Identifies the lease. Can be specified in any valid GUID string format.
     :vartype lease_id: str
@@ -3478,7 +3477,7 @@ def __init__(
     ) -> None:
         """
         :keyword action: Specifies the lease action. Can be one of the available actions. Required.
-         Known values are: "Acquire", "Renew", "Change", "Release", and "Break".
+         Known values are: "Acquire", "Renew", "Change", "Release", "Break", and "Break".
         :paramtype action: str or ~azure.mgmt.storage.v2022_09_01.models.LeaseShareAction
         :keyword lease_id: Identifies the lease. Can be specified in any valid GUID string format.
         :paramtype lease_id: str
@@ -3676,7 +3675,7 @@ def __init__(self, **kwargs: Any) -> None:
         self.value = None
 
 
-class ListContainerItem(AzureEntityResource):  # pylint: disable=too-many-instance-attributes
+class ListContainerItem(AzureEntityResource):
     """The blob container properties be listed out.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -4044,7 +4043,7 @@ def __init__(self, **kwargs: Any) -> None:
         self.value = None
 
 
-class LocalUser(Resource):  # pylint: disable=too-many-instance-attributes
+class LocalUser(Resource):
     """The local user associated with the storage accounts.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -5678,7 +5677,7 @@ def __init__(
         self.expiration_action = expiration_action
 
 
-class ServiceSasParameters(_serialization.Model):  # pylint: disable=too-many-instance-attributes
+class ServiceSasParameters(_serialization.Model):
     """The parameters to list service SAS credentials of a specific resource.
 
     All required parameters must be populated in order to send to server.
@@ -6112,7 +6111,7 @@ class SshPublicKey(_serialization.Model):
 
     :ivar description: Optional. It is used to store the function/usage of the key.
     :vartype description: str
-    :ivar key: Ssh public key base64 encoded. The format should be: ':code:`<keyType>`
+    :ivar key: Ssh public key base64 encoded. The format should be: '\\ :code:`<keyType>`
      :code:`<keyData>`', e.g. ssh-rsa AAAABBBB.
     :vartype key: str
     """
@@ -6126,7 +6125,7 @@ def __init__(self, *, description: Optional[str] = None, key: Optional[str] = No
         """
         :keyword description: Optional. It is used to store the function/usage of the key.
         :paramtype description: str
-        :keyword key: Ssh public key base64 encoded. The format should be: ':code:`<keyType>`
+        :keyword key: Ssh public key base64 encoded. The format should be: '\\ :code:`<keyType>`
          :code:`<keyData>`', e.g. ssh-rsa AAAABBBB.
         :paramtype key: str
         """
@@ -6184,7 +6183,7 @@ def __init__(self, *, location: str, tags: Optional[Dict[str, str]] = None, **kw
         self.location = location
 
 
-class StorageAccount(TrackedResource):  # pylint: disable=too-many-instance-attributes
+class StorageAccount(TrackedResource):
     """The storage account.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -6604,7 +6603,7 @@ def __init__(self, *, name: str, **kwargs: Any) -> None:
         self.name = name
 
 
-class StorageAccountCreateParameters(_serialization.Model):  # pylint: disable=too-many-instance-attributes
+class StorageAccountCreateParameters(_serialization.Model):
     """The parameters used when creating a storage account.
 
     All required parameters must be populated in order to send to server.
@@ -7173,7 +7172,7 @@ def __init__(self, *, target_sku_name: Optional[Union[str, "_models.SkuName"]] =
         self.end_time = None
 
 
-class StorageAccountUpdateParameters(_serialization.Model):  # pylint: disable=too-many-instance-attributes
+class StorageAccountUpdateParameters(_serialization.Model):
     """The parameters that can be provided when updating the storage account properties.
 
     :ivar sku: Gets or sets the SKU name. Note that the SKU name cannot be updated to Standard_ZRS,
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/models/_storage_management_client_enums.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/models/_storage_management_client_enums.py
index 05a30001df5c..2b474bb82436 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/models/_storage_management_client_enums.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/models/_storage_management_client_enums.py
@@ -292,6 +292,7 @@ class LeaseContainerRequestEnum(str, Enum, metaclass=CaseInsensitiveEnumMeta):
     RENEW = "Renew"
     CHANGE = "Change"
     RELEASE = "Release"
+    BREAK = "Break"
     BREAK_ENUM = "Break"
 
 
@@ -311,6 +312,7 @@ class LeaseShareAction(str, Enum, metaclass=CaseInsensitiveEnumMeta):
     RENEW = "Renew"
     CHANGE = "Change"
     RELEASE = "Release"
+    BREAK = "Break"
     BREAK_ENUM = "Break"
 
 
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/operations/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/operations/__init__.py
index bbce85749d18..a0549517e087 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/operations/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/operations/__init__.py
@@ -5,30 +5,36 @@
 # 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 ._skus_operations import SkusOperations
-from ._storage_accounts_operations import StorageAccountsOperations
-from ._deleted_accounts_operations import DeletedAccountsOperations
-from ._usages_operations import UsagesOperations
-from ._management_policies_operations import ManagementPoliciesOperations
-from ._blob_inventory_policies_operations import BlobInventoryPoliciesOperations
-from ._private_endpoint_connections_operations import PrivateEndpointConnectionsOperations
-from ._private_link_resources_operations import PrivateLinkResourcesOperations
-from ._object_replication_policies_operations import ObjectReplicationPoliciesOperations
-from ._local_users_operations import LocalUsersOperations
-from ._encryption_scopes_operations import EncryptionScopesOperations
-from ._blob_services_operations import BlobServicesOperations
-from ._blob_containers_operations import BlobContainersOperations
-from ._file_services_operations import FileServicesOperations
-from ._file_shares_operations import FileSharesOperations
-from ._queue_services_operations import QueueServicesOperations
-from ._queue_operations import QueueOperations
-from ._table_services_operations import TableServicesOperations
-from ._table_operations import TableOperations
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._operations import Operations  # type: ignore
+from ._skus_operations import SkusOperations  # type: ignore
+from ._storage_accounts_operations import StorageAccountsOperations  # type: ignore
+from ._deleted_accounts_operations import DeletedAccountsOperations  # type: ignore
+from ._usages_operations import UsagesOperations  # type: ignore
+from ._management_policies_operations import ManagementPoliciesOperations  # type: ignore
+from ._blob_inventory_policies_operations import BlobInventoryPoliciesOperations  # type: ignore
+from ._private_endpoint_connections_operations import PrivateEndpointConnectionsOperations  # type: ignore
+from ._private_link_resources_operations import PrivateLinkResourcesOperations  # type: ignore
+from ._object_replication_policies_operations import ObjectReplicationPoliciesOperations  # type: ignore
+from ._local_users_operations import LocalUsersOperations  # type: ignore
+from ._encryption_scopes_operations import EncryptionScopesOperations  # type: ignore
+from ._blob_services_operations import BlobServicesOperations  # type: ignore
+from ._blob_containers_operations import BlobContainersOperations  # type: ignore
+from ._file_services_operations import FileServicesOperations  # type: ignore
+from ._file_shares_operations import FileSharesOperations  # type: ignore
+from ._queue_services_operations import QueueServicesOperations  # type: ignore
+from ._queue_operations import QueueOperations  # type: ignore
+from ._table_services_operations import TableServicesOperations  # type: ignore
+from ._table_operations import TableOperations  # 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__ = [
@@ -53,5 +59,5 @@
     "TableServicesOperations",
     "TableOperations",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/operations/_blob_containers_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/operations/_blob_containers_operations.py
index 75c73ec453bb..c3095b1074c3 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/operations/_blob_containers_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/operations/_blob_containers_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,7 @@
 # --------------------------------------------------------------------------
 from io import IOBase
 import sys
-from typing import Any, Callable, Dict, IO, Iterable, Literal, Optional, Type, TypeVar, Union, cast, overload
+from typing import Any, Callable, Dict, IO, Iterable, Iterator, Literal, Optional, TypeVar, Union, cast, overload
 import urllib.parse
 
 from azure.core.exceptions import (
@@ -17,13 +17,14 @@
     ResourceExistsError,
     ResourceNotFoundError,
     ResourceNotModifiedError,
+    StreamClosedError,
+    StreamConsumedError,
     map_error,
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
 from azure.core.polling import LROPoller, NoPolling, PollingMethod
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
@@ -31,12 +32,11 @@
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -649,7 +649,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-09-01"))
         cls: ClsType[_models.ListContainerItems] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -671,7 +671,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -687,7 +686,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -822,7 +820,7 @@ def create(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -857,7 +855,6 @@ def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -871,11 +868,7 @@ def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("BlobContainer", pipeline_response)
-
-        if response.status_code == 201:
-            deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -985,7 +978,7 @@ def update(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1020,7 +1013,6 @@ def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1034,7 +1026,7 @@ def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1063,7 +1055,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1086,7 +1078,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1100,7 +1091,7 @@ def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1129,7 +1120,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,
@@ -1152,7 +1143,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1275,7 +1265,7 @@ def set_legal_hold(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.LegalHold
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1310,7 +1300,6 @@ def set_legal_hold(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1324,7 +1313,7 @@ def set_legal_hold(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LegalHold", pipeline_response)
+        deserialized = self._deserialize("LegalHold", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1434,7 +1423,7 @@ def clear_legal_hold(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.LegalHold
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1469,7 +1458,6 @@ def clear_legal_hold(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1483,7 +1471,7 @@ def clear_legal_hold(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LegalHold", pipeline_response)
+        deserialized = self._deserialize("LegalHold", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1610,7 +1598,7 @@ def create_or_update_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1651,7 +1639,6 @@ def create_or_update_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1668,7 +1655,7 @@ def create_or_update_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1707,7 +1694,7 @@ def get_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1733,7 +1720,6 @@ def get_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1750,7 +1736,7 @@ def get_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1786,7 +1772,7 @@ def delete_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1812,7 +1798,6 @@ def delete_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1829,7 +1814,7 @@ def delete_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1863,7 +1848,7 @@ def lock_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1887,7 +1872,6 @@ def lock_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1904,7 +1888,7 @@ def lock_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -2034,7 +2018,7 @@ def extend_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -2073,7 +2057,6 @@ def extend_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -2090,7 +2073,7 @@ def extend_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -2200,7 +2183,7 @@ def lease(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.LeaseContainerResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -2238,7 +2221,6 @@ def lease(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -2252,17 +2234,17 @@ def lease(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LeaseContainerResponse", pipeline_response)
+        deserialized = self._deserialize("LeaseContainerResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
 
         return deserialized  # type: ignore
 
-    def _object_level_worm_initial(  # pylint: disable=inconsistent-return-statements
+    def _object_level_worm_initial(
         self, resource_group_name: str, account_name: str, container_name: str, **kwargs: Any
-    ) -> None:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> Iterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -2274,7 +2256,7 @@ def _object_level_worm_initial(  # pylint: disable=inconsistent-return-statement
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-09-01"))
-        cls: ClsType[None] = kwargs.pop("cls", None)
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
 
         _request = build_object_level_worm_request(
             resource_group_name=resource_group_name,
@@ -2285,10 +2267,10 @@ def _object_level_worm_initial(  # pylint: disable=inconsistent-return-statement
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -2296,11 +2278,19 @@ def _object_level_worm_initial(  # pylint: disable=inconsistent-return-statement
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
-            return cls(pipeline_response, None, {})  # type: ignore
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
 
     @distributed_trace
     def begin_object_level_worm(
@@ -2336,7 +2326,7 @@ def begin_object_level_worm(
         lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
         cont_token: Optional[str] = kwargs.pop("continuation_token", None)
         if cont_token is None:
-            raw_result = self._object_level_worm_initial(  # type: ignore
+            raw_result = self._object_level_worm_initial(
                 resource_group_name=resource_group_name,
                 account_name=account_name,
                 container_name=container_name,
@@ -2346,6 +2336,7 @@ def begin_object_level_worm(
                 params=_params,
                 **kwargs
             )
+            raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/operations/_blob_inventory_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/operations/_blob_inventory_policies_operations.py
index 1600eabec091..a52ee9e0a6ed 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/operations/_blob_inventory_policies_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/operations/_blob_inventory_policies_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 (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -235,7 +232,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.BlobInventoryPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -258,7 +255,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -272,7 +268,7 @@ def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response)
+        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -376,7 +372,7 @@ def create_or_update(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.BlobInventoryPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -411,7 +407,6 @@ def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -425,7 +420,7 @@ def create_or_update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response)
+        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -457,7 +452,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,
@@ -480,7 +475,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -521,7 +515,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-09-01"))
         cls: ClsType[_models.ListBlobInventoryPolicy] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -540,7 +534,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -556,7 +549,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/operations/_blob_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/operations/_blob_services_operations.py
index 2e773ea84b23..c95fd810bd69 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/operations/_blob_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/operations/_blob_services_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, Literal, Optional, Type, TypeVar, Union, overload
+from typing import Any, Callable, Dict, IO, Iterable, Literal, Optional, TypeVar, Union, overload
 import urllib.parse
 
 from azure.core.exceptions import (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -191,7 +188,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-09-01"))
         cls: ClsType[_models.BlobServiceItems] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -210,7 +207,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -226,7 +222,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -343,7 +338,7 @@ def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.BlobServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -379,7 +374,6 @@ def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -393,7 +387,7 @@ def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobServiceProperties", pipeline_response)
+        deserialized = self._deserialize("BlobServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -418,7 +412,7 @@ def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.BlobServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -442,7 +436,6 @@ def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -456,7 +449,7 @@ def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobServiceProperties", pipeline_response)
+        deserialized = self._deserialize("BlobServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/operations/_deleted_accounts_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/operations/_deleted_accounts_operations.py
index 1eb70e4d45f0..262bf79b3210 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/operations/_deleted_accounts_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/operations/_deleted_accounts_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 (
@@ -20,20 +19,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -130,7 +127,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.DeletedAccount"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-09-01"))
         cls: ClsType[_models.DeletedAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -147,7 +144,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -163,7 +159,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -205,7 +200,7 @@ def get(self, deleted_account_name: str, location: str, **kwargs: Any) -> _model
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.DeletedAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -227,7 +222,6 @@ def get(self, deleted_account_name: str, location: str, **kwargs: Any) -> _model
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -242,7 +236,7 @@ def get(self, deleted_account_name: str, location: str, **kwargs: Any) -> _model
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("DeletedAccount", pipeline_response)
+        deserialized = self._deserialize("DeletedAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/operations/_encryption_scopes_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/operations/_encryption_scopes_operations.py
index aeaf8d7fc2f7..bd57a81e5c41 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/operations/_encryption_scopes_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/operations/_encryption_scopes_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 (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -330,7 +327,7 @@ def put(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.EncryptionScope
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -365,7 +362,6 @@ def put(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -380,11 +376,7 @@ def put(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("EncryptionScope", pipeline_response)
-
-        if response.status_code == 201:
-            deserialized = self._deserialize("EncryptionScope", pipeline_response)
+        deserialized = self._deserialize("EncryptionScope", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -494,7 +486,7 @@ def patch(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.EncryptionScope
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -529,7 +521,6 @@ def patch(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -544,7 +535,7 @@ def patch(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("EncryptionScope", pipeline_response)
+        deserialized = self._deserialize("EncryptionScope", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -573,7 +564,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.EncryptionScope
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -596,7 +587,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -611,7 +601,7 @@ def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("EncryptionScope", pipeline_response)
+        deserialized = self._deserialize("EncryptionScope", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -656,7 +646,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-09-01"))
         cls: ClsType[_models.EncryptionScopeListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -678,7 +668,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -694,7 +683,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/operations/_file_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/operations/_file_services_operations.py
index f352f4a97529..6a2bf12ad04c 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/operations/_file_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/operations/_file_services_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, Literal, Optional, Type, TypeVar, Union, overload
+from typing import Any, Callable, Dict, IO, Literal, Optional, TypeVar, Union, overload
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -19,20 +18,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -179,7 +176,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.FileServiceItems
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -201,7 +198,6 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -215,7 +211,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileServiceItems", pipeline_response)
+        deserialized = self._deserialize("FileServiceItems", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -310,7 +306,7 @@ def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.FileServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -346,7 +342,6 @@ def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -360,7 +355,7 @@ def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileServiceProperties", pipeline_response)
+        deserialized = self._deserialize("FileServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -385,7 +380,7 @@ def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.FileServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -409,7 +404,6 @@ def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -423,7 +417,7 @@ def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileServiceProperties", pipeline_response)
+        deserialized = self._deserialize("FileServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/operations/_file_shares_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/operations/_file_shares_operations.py
index 9160249c81b1..0f5dcf6e8abd 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/operations/_file_shares_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/operations/_file_shares_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,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 (
@@ -21,20 +21,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -401,7 +399,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-09-01"))
         cls: ClsType[_models.FileShareItems] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -423,7 +421,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -439,7 +436,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -586,7 +582,7 @@ def create(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.FileShare
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -622,7 +618,6 @@ def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -636,11 +631,7 @@ def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("FileShare", pipeline_response)
-
-        if response.status_code == 201:
-            deserialized = self._deserialize("FileShare", pipeline_response)
+        deserialized = self._deserialize("FileShare", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -750,7 +741,7 @@ def update(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.FileShare
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -785,7 +776,6 @@ def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -799,7 +789,7 @@ def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileShare", pipeline_response)
+        deserialized = self._deserialize("FileShare", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -840,7 +830,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.FileShare
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -865,7 +855,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -879,7 +868,7 @@ def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileShare", pipeline_response)
+        deserialized = self._deserialize("FileShare", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -924,7 +913,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,
@@ -949,7 +938,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -967,7 +955,7 @@ def delete(  # pylint: disable=inconsistent-return-statements
             return cls(pipeline_response, None, {})  # type: ignore
 
     @overload
-    def restore(  # pylint: disable=inconsistent-return-statements
+    def restore(
         self,
         resource_group_name: str,
         account_name: str,
@@ -1002,7 +990,7 @@ def restore(  # pylint: disable=inconsistent-return-statements
         """
 
     @overload
-    def restore(  # pylint: disable=inconsistent-return-statements
+    def restore(
         self,
         resource_group_name: str,
         account_name: str,
@@ -1065,7 +1053,7 @@ def restore(  # 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,
@@ -1100,7 +1088,6 @@ def restore(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1232,7 +1219,7 @@ def lease(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.LeaseShareResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1271,7 +1258,6 @@ def lease(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1288,7 +1274,7 @@ def lease(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("LeaseShareResponse", pipeline_response)
+        deserialized = self._deserialize("LeaseShareResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/operations/_local_users_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/operations/_local_users_operations.py
index c87ffc0778fc..b6bb7deaaf55 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/operations/_local_users_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/operations/_local_users_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 (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -287,7 +284,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> It
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-09-01"))
         cls: ClsType[_models.LocalUsers] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -306,7 +303,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -322,7 +318,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -370,7 +365,7 @@ def get(self, resource_group_name: str, account_name: str, username: str, **kwar
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.LocalUser
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -393,7 +388,6 @@ def get(self, resource_group_name: str, account_name: str, username: str, **kwar
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -408,7 +402,7 @@ def get(self, resource_group_name: str, account_name: str, username: str, **kwar
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LocalUser", pipeline_response)
+        deserialized = self._deserialize("LocalUser", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -509,7 +503,7 @@ def create_or_update(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.LocalUser
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -544,7 +538,6 @@ def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -559,7 +552,7 @@ def create_or_update(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LocalUser", pipeline_response)
+        deserialized = self._deserialize("LocalUser", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -586,7 +579,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,
@@ -609,7 +602,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -647,7 +639,7 @@ def list_keys(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.LocalUserKeys
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -670,7 +662,6 @@ def list_keys(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -685,7 +676,7 @@ def list_keys(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LocalUserKeys", pipeline_response)
+        deserialized = self._deserialize("LocalUserKeys", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -712,7 +703,7 @@ def regenerate_password(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.LocalUserRegeneratePasswordResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -735,7 +726,6 @@ def regenerate_password(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -750,7 +740,7 @@ def regenerate_password(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LocalUserRegeneratePasswordResult", pipeline_response)
+        deserialized = self._deserialize("LocalUserRegeneratePasswordResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/operations/_management_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/operations/_management_policies_operations.py
index 08c55a2eae73..529eac743099 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/operations/_management_policies_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/operations/_management_policies_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,
@@ -19,20 +18,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -196,7 +193,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.ManagementPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -219,7 +216,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -233,7 +229,7 @@ def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ManagementPolicy", pipeline_response)
+        deserialized = self._deserialize("ManagementPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -337,7 +333,7 @@ def create_or_update(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.ManagementPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -372,7 +368,6 @@ def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -386,7 +381,7 @@ def create_or_update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ManagementPolicy", pipeline_response)
+        deserialized = self._deserialize("ManagementPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -418,7 +413,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,
@@ -441,7 +436,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/operations/_object_replication_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/operations/_object_replication_policies_operations.py
index eacfc0817ecb..cccce083cdb8 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/operations/_object_replication_policies_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/operations/_object_replication_policies_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 (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -229,7 +226,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-09-01"))
         cls: ClsType[_models.ObjectReplicationPolicies] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -248,7 +245,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -264,7 +260,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -316,7 +311,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.ObjectReplicationPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -339,7 +334,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -354,7 +348,7 @@ def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response)
+        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -464,7 +458,7 @@ def create_or_update(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.ObjectReplicationPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -499,7 +493,6 @@ def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -514,7 +507,7 @@ def create_or_update(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response)
+        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -543,7 +536,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,
@@ -566,7 +559,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/operations/_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/operations/_operations.py
index a54571d70cb4..7b10081a6f11 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/operations/_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/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 (
@@ -20,20 +19,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -94,7 +91,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.Operation"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-09-01"))
         cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -110,7 +107,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -126,7 +122,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/operations/_private_endpoint_connections_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/operations/_private_endpoint_connections_operations.py
index a6bcca87c0b0..a1549d4c4416 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/operations/_private_endpoint_connections_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/operations/_private_endpoint_connections_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 (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -241,7 +238,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-09-01"))
         cls: ClsType[_models.PrivateEndpointConnectionListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -260,7 +257,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -276,7 +272,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -325,7 +320,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.PrivateEndpointConnection
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -348,7 +343,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -363,7 +357,7 @@ def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response)
+        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -464,7 +458,7 @@ def put(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.PrivateEndpointConnection
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -499,7 +493,6 @@ def put(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -514,7 +507,7 @@ def put(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response)
+        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -541,7 +534,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,
@@ -564,7 +557,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/operations/_private_link_resources_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/operations/_private_link_resources_operations.py
index f8dfe3fadf52..c8be8f462294 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/operations/_private_link_resources_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/operations/_private_link_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, Optional, Type, TypeVar
+from typing import Any, Callable, Dict, Optional, TypeVar
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -18,20 +17,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -109,7 +106,7 @@ def list_by_storage_account(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.PrivateLinkResourceListResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -131,7 +128,6 @@ def list_by_storage_account(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -145,7 +141,7 @@ def list_by_storage_account(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("PrivateLinkResourceListResult", pipeline_response)
+        deserialized = self._deserialize("PrivateLinkResourceListResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/operations/_queue_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/operations/_queue_operations.py
index 20739e8bfbf5..13a958a73824 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/operations/_queue_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/operations/_queue_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 (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -375,7 +372,7 @@ def create(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.StorageQueue
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -410,7 +407,6 @@ def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -424,7 +420,7 @@ def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageQueue", pipeline_response)
+        deserialized = self._deserialize("StorageQueue", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -531,7 +527,7 @@ def update(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.StorageQueue
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -566,7 +562,6 @@ def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -580,7 +575,7 @@ def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageQueue", pipeline_response)
+        deserialized = self._deserialize("StorageQueue", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -607,7 +602,7 @@ def get(self, resource_group_name: str, account_name: str, queue_name: str, **kw
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.StorageQueue
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -630,7 +625,6 @@ def get(self, resource_group_name: str, account_name: str, queue_name: str, **kw
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -644,7 +638,7 @@ def get(self, resource_group_name: str, account_name: str, queue_name: str, **kw
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageQueue", pipeline_response)
+        deserialized = self._deserialize("StorageQueue", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -673,7 +667,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,
@@ -696,7 +690,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -747,7 +740,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-09-01"))
         cls: ClsType[_models.ListQueueResource] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -768,7 +761,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -784,7 +776,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/operations/_queue_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/operations/_queue_services_operations.py
index e934ba9fafa1..0c14e8c73fe5 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/operations/_queue_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/operations/_queue_services_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, Literal, Optional, Type, TypeVar, Union, overload
+from typing import Any, Callable, Dict, IO, Literal, Optional, TypeVar, Union, overload
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -19,20 +18,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -179,7 +176,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.ListQueueServices
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -201,7 +198,6 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -215,7 +211,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListQueueServices", pipeline_response)
+        deserialized = self._deserialize("ListQueueServices", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -310,7 +306,7 @@ def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.QueueServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -346,7 +342,6 @@ def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -360,7 +355,7 @@ def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("QueueServiceProperties", pipeline_response)
+        deserialized = self._deserialize("QueueServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -385,7 +380,7 @@ def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.QueueServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -409,7 +404,6 @@ def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -423,7 +417,7 @@ def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("QueueServiceProperties", pipeline_response)
+        deserialized = self._deserialize("QueueServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/operations/_skus_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/operations/_skus_operations.py
index ae4341f2b3af..8d6ceb923e43 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/operations/_skus_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/operations/_skus_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 (
@@ -20,20 +19,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -99,7 +96,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.SkuInformation"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-09-01"))
         cls: ClsType[_models.StorageSkuListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -116,7 +113,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -132,7 +128,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/operations/_storage_accounts_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/operations/_storage_accounts_operations.py
index 0f38de305e79..d6aadb1e89f5 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/operations/_storage_accounts_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/operations/_storage_accounts_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,7 @@
 # --------------------------------------------------------------------------
 from io import IOBase
 import sys
-from typing import Any, Callable, Dict, IO, Iterable, Literal, Optional, Type, TypeVar, Union, cast, overload
+from typing import Any, Callable, Dict, IO, Iterable, Iterator, Literal, Optional, TypeVar, Union, cast, overload
 import urllib.parse
 
 from azure.core.exceptions import (
@@ -17,13 +17,14 @@
     ResourceExistsError,
     ResourceNotFoundError,
     ResourceNotModifiedError,
+    StreamClosedError,
+    StreamConsumedError,
     map_error,
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
 from azure.core.polling import LROPoller, NoPolling, PollingMethod
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
@@ -31,12 +32,11 @@
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -656,7 +656,7 @@ def check_name_availability(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.CheckNameAvailabilityResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -688,7 +688,6 @@ def check_name_availability(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -702,7 +701,7 @@ def check_name_availability(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response)
+        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -715,8 +714,8 @@ def _create_initial(
         account_name: str,
         parameters: Union[_models.StorageAccountCreateParameters, IO[bytes]],
         **kwargs: Any
-    ) -> Optional[_models.StorageAccount]:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> Iterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -729,7 +728,7 @@ def _create_initial(
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-09-01"))
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
-        cls: ClsType[Optional[_models.StorageAccount]] = kwargs.pop("cls", None)
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
         _json = None
@@ -750,10 +749,10 @@ def _create_initial(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -761,12 +760,14 @@ def _create_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = None
-        if response.status_code == 200:
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -889,10 +890,11 @@ def begin_create(
                 params=_params,
                 **kwargs
             )
+            raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+            deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
             if cls:
                 return cls(pipeline_response, deserialized, {})  # type: ignore
             return deserialized
@@ -931,7 +933,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,
@@ -953,7 +955,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -998,7 +999,7 @@ def get_properties(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1021,7 +1022,6 @@ def get_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1035,7 +1035,7 @@ def get_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1146,7 +1146,7 @@ def update(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1180,7 +1180,6 @@ def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1194,7 +1193,7 @@ def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1216,7 +1215,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.StorageAccount"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-09-01"))
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1233,7 +1232,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -1249,7 +1247,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -1296,7 +1293,7 @@ def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> Ite
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-09-01"))
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1314,7 +1311,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -1330,7 +1326,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -1380,7 +1375,7 @@ def list_keys(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.StorageAccountListKeysResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1403,7 +1398,6 @@ def list_keys(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1417,7 +1411,7 @@ def list_keys(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response)
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1511,7 +1505,7 @@ def regenerate_key(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.StorageAccountListKeysResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1545,7 +1539,6 @@ def regenerate_key(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1559,7 +1552,7 @@ def regenerate_key(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response)
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1650,7 +1643,7 @@ def list_account_sas(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.ListAccountSasResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1684,7 +1677,6 @@ def list_account_sas(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1698,7 +1690,7 @@ def list_account_sas(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListAccountSasResponse", pipeline_response)
+        deserialized = self._deserialize("ListAccountSasResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1787,7 +1779,7 @@ def list_service_sas(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.ListServiceSasResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1821,7 +1813,6 @@ def list_service_sas(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1835,17 +1826,17 @@ def list_service_sas(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListServiceSasResponse", pipeline_response)
+        deserialized = self._deserialize("ListServiceSasResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
 
         return deserialized  # type: ignore
 
-    def _failover_initial(  # pylint: disable=inconsistent-return-statements
+    def _failover_initial(
         self, resource_group_name: str, account_name: str, failover_type: Literal["Planned"] = "Planned", **kwargs: Any
-    ) -> None:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> Iterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1857,7 +1848,7 @@ def _failover_initial(  # pylint: disable=inconsistent-return-statements
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-09-01"))
-        cls: ClsType[None] = kwargs.pop("cls", None)
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
 
         _request = build_failover_request(
             resource_group_name=resource_group_name,
@@ -1868,10 +1859,10 @@ def _failover_initial(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -1879,11 +1870,19 @@ def _failover_initial(  # pylint: disable=inconsistent-return-statements
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
-            return cls(pipeline_response, None, {})  # type: ignore
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
 
     @distributed_trace
     def begin_failover(
@@ -1924,7 +1923,7 @@ def begin_failover(
         lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
         cont_token: Optional[str] = kwargs.pop("continuation_token", None)
         if cont_token is None:
-            raw_result = self._failover_initial(  # type: ignore
+            raw_result = self._failover_initial(
                 resource_group_name=resource_group_name,
                 account_name=account_name,
                 failover_type=failover_type,
@@ -1934,6 +1933,7 @@ def begin_failover(
                 params=_params,
                 **kwargs
             )
+            raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
@@ -1957,10 +1957,10 @@ def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-
             )
         return LROPoller[None](self._client, raw_result, get_long_running_output, polling_method)  # type: ignore
 
-    def _hierarchical_namespace_migration_initial(  # pylint: disable=inconsistent-return-statements,name-too-long
+    def _hierarchical_namespace_migration_initial(  # pylint: disable=name-too-long
         self, resource_group_name: str, account_name: str, request_type: str, **kwargs: Any
-    ) -> None:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> Iterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1972,7 +1972,7 @@ def _hierarchical_namespace_migration_initial(  # pylint: disable=inconsistent-r
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-09-01"))
-        cls: ClsType[None] = kwargs.pop("cls", None)
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
 
         _request = build_hierarchical_namespace_migration_request(
             resource_group_name=resource_group_name,
@@ -1983,10 +1983,10 @@ def _hierarchical_namespace_migration_initial(  # pylint: disable=inconsistent-r
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -1994,12 +1994,20 @@ def _hierarchical_namespace_migration_initial(  # pylint: disable=inconsistent-r
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
-            return cls(pipeline_response, None, {})  # type: ignore
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
 
     @distributed_trace
     def begin_hierarchical_namespace_migration(
@@ -2032,7 +2040,7 @@ def begin_hierarchical_namespace_migration(
         lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
         cont_token: Optional[str] = kwargs.pop("continuation_token", None)
         if cont_token is None:
-            raw_result = self._hierarchical_namespace_migration_initial(  # type: ignore
+            raw_result = self._hierarchical_namespace_migration_initial(
                 resource_group_name=resource_group_name,
                 account_name=account_name,
                 request_type=request_type,
@@ -2042,6 +2050,7 @@ def begin_hierarchical_namespace_migration(
                 params=_params,
                 **kwargs
             )
+            raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
@@ -2065,10 +2074,10 @@ def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-
             )
         return LROPoller[None](self._client, raw_result, get_long_running_output, polling_method)  # type: ignore
 
-    def _abort_hierarchical_namespace_migration_initial(  # pylint: disable=inconsistent-return-statements,name-too-long
+    def _abort_hierarchical_namespace_migration_initial(  # pylint: disable=name-too-long
         self, resource_group_name: str, account_name: str, **kwargs: Any
-    ) -> None:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> Iterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -2080,7 +2089,7 @@ def _abort_hierarchical_namespace_migration_initial(  # pylint: disable=inconsis
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-09-01"))
-        cls: ClsType[None] = kwargs.pop("cls", None)
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
 
         _request = build_abort_hierarchical_namespace_migration_request(
             resource_group_name=resource_group_name,
@@ -2090,10 +2099,10 @@ def _abort_hierarchical_namespace_migration_initial(  # pylint: disable=inconsis
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -2101,12 +2110,20 @@ def _abort_hierarchical_namespace_migration_initial(  # pylint: disable=inconsis
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
-            return cls(pipeline_response, None, {})  # type: ignore
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
 
     @distributed_trace
     def begin_abort_hierarchical_namespace_migration(  # pylint: disable=name-too-long
@@ -2134,7 +2151,7 @@ def begin_abort_hierarchical_namespace_migration(  # pylint: disable=name-too-lo
         lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
         cont_token: Optional[str] = kwargs.pop("continuation_token", None)
         if cont_token is None:
-            raw_result = self._abort_hierarchical_namespace_migration_initial(  # type: ignore
+            raw_result = self._abort_hierarchical_namespace_migration_initial(
                 resource_group_name=resource_group_name,
                 account_name=account_name,
                 api_version=api_version,
@@ -2143,6 +2160,7 @@ def begin_abort_hierarchical_namespace_migration(  # pylint: disable=name-too-lo
                 params=_params,
                 **kwargs
             )
+            raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
@@ -2172,8 +2190,8 @@ def _restore_blob_ranges_initial(
         account_name: str,
         parameters: Union[_models.BlobRestoreParameters, IO[bytes]],
         **kwargs: Any
-    ) -> _models.BlobRestoreStatus:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> Iterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -2186,7 +2204,7 @@ def _restore_blob_ranges_initial(
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-09-01"))
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
-        cls: ClsType[_models.BlobRestoreStatus] = kwargs.pop("cls", None)
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
         _json = None
@@ -2207,10 +2225,10 @@ def _restore_blob_ranges_initial(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -2218,14 +2236,14 @@ def _restore_blob_ranges_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response)
-
-        if response.status_code == 202:
-            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response)
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -2338,10 +2356,11 @@ def begin_restore_blob_ranges(
                 params=_params,
                 **kwargs
             )
+            raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):
-            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response)
+            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response.http_response)
             if cls:
                 return cls(pipeline_response, deserialized, {})  # type: ignore
             return deserialized
@@ -2382,7 +2401,7 @@ def revoke_user_delegation_keys(  # pylint: disable=inconsistent-return-statemen
         :rtype: None
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -2404,7 +2423,6 @@ def revoke_user_delegation_keys(  # pylint: disable=inconsistent-return-statemen
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/operations/_table_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/operations/_table_operations.py
index 2052cc10020d..838812f95c6a 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/operations/_table_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/operations/_table_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 (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -340,7 +337,7 @@ def create(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.Table
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -378,7 +375,6 @@ def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -392,7 +388,7 @@ def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("Table", pipeline_response)
+        deserialized = self._deserialize("Table", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -496,7 +492,7 @@ def update(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.Table
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -534,7 +530,6 @@ def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -548,7 +543,7 @@ def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("Table", pipeline_response)
+        deserialized = self._deserialize("Table", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -574,7 +569,7 @@ def get(self, resource_group_name: str, account_name: str, table_name: str, **kw
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.Table
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -597,7 +592,6 @@ def get(self, resource_group_name: str, account_name: str, table_name: str, **kw
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -611,7 +605,7 @@ def get(self, resource_group_name: str, account_name: str, table_name: str, **kw
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("Table", pipeline_response)
+        deserialized = self._deserialize("Table", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -639,7 +633,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,
@@ -662,7 +656,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -700,7 +693,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> It
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-09-01"))
         cls: ClsType[_models.ListTableResource] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -719,7 +712,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -735,7 +727,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/operations/_table_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/operations/_table_services_operations.py
index 2bd19f912f02..6b2a38ea35bf 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/operations/_table_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/operations/_table_services_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, Literal, Optional, Type, TypeVar, Union, overload
+from typing import Any, Callable, Dict, IO, Literal, Optional, TypeVar, Union, overload
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -19,20 +18,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -179,7 +176,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.ListTableServices
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -201,7 +198,6 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -215,7 +211,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListTableServices", pipeline_response)
+        deserialized = self._deserialize("ListTableServices", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -310,7 +306,7 @@ def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.TableServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -346,7 +342,6 @@ def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -360,7 +355,7 @@ def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("TableServiceProperties", pipeline_response)
+        deserialized = self._deserialize("TableServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -385,7 +380,7 @@ def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2022_09_01.models.TableServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -409,7 +404,6 @@ def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -423,7 +417,7 @@ def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("TableServiceProperties", pipeline_response)
+        deserialized = self._deserialize("TableServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/operations/_usages_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/operations/_usages_operations.py
index b5c9e5fcb472..5e2f74b764a4 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/operations/_usages_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2022_09_01/operations/_usages_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 (
@@ -20,20 +19,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -105,7 +102,7 @@ def list_by_location(self, location: str, **kwargs: Any) -> Iterable["_models.Us
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2022-09-01"))
         cls: ClsType[_models.UsageListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -123,7 +120,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -139,7 +135,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/__init__.py
index a860a5c185c9..60980065e1ee 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/__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 ._storage_management_client import StorageManagementClient
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._storage_management_client import StorageManagementClient  # 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__ = [
     "StorageManagementClient",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/_configuration.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/_configuration.py
index 039fbf2b172c..cd50c9b357c3 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/_configuration.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/_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 StorageManagementClientConfiguration:  # pylint: disable=too-many-instance-attributes,name-too-long
+class StorageManagementClientConfiguration:  # pylint: disable=too-many-instance-attributes
     """Configuration for StorageManagementClient.
 
     Note that all parameters used to create this instance are saved as instance
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/_metadata.json b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/_metadata.json
index 104502301b8d..0a31caef7770 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/_metadata.json
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/_metadata.json
@@ -10,8 +10,8 @@
         "azure_arm": true,
         "has_public_lro_operations": true,
         "client_side_validation": false,
-        "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"ARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementClientConfiguration\"], \".._serialization\": [\"Deserializer\", \"Serializer\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}}",
-        "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"AsyncARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"AsyncARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementClientConfiguration\"], \"..._serialization\": [\"Deserializer\", \"Serializer\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"]}}}"
+        "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"ARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementClientConfiguration\"], \".._serialization\": [\"Deserializer\", \"Serializer\"]}, \"stdlib\": {\"typing_extensions\": [\"Self\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}}",
+        "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"AsyncARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"AsyncARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementClientConfiguration\"], \"..._serialization\": [\"Deserializer\", \"Serializer\"]}, \"stdlib\": {\"typing_extensions\": [\"Self\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"]}}}"
     },
     "global_parameters": {
         "sync": {
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/_storage_management_client.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/_storage_management_client.py
index 9df6c2ea2965..02367cd45949 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/_storage_management_client.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/_storage_management_client.py
@@ -8,6 +8,7 @@
 
 from copy import deepcopy
 from typing import Any, TYPE_CHECKING
+from typing_extensions import Self
 
 from azure.core.pipeline import policies
 from azure.core.rest import HttpRequest, HttpResponse
@@ -41,11 +42,10 @@
 )
 
 if TYPE_CHECKING:
-    # pylint: disable=unused-import,ungrouped-imports
     from azure.core.credentials import TokenCredential
 
 
-class StorageManagementClient:  # pylint: disable=client-accepts-api-version-keyword,too-many-instance-attributes
+class StorageManagementClient:  # pylint: disable=too-many-instance-attributes
     """The Azure Storage Management API.
 
     :ivar operations: Operations operations
@@ -217,7 +217,7 @@ def _send_request(self, request: HttpRequest, *, stream: bool = False, **kwargs:
     def close(self) -> None:
         self._client.close()
 
-    def __enter__(self) -> "StorageManagementClient":
+    def __enter__(self) -> Self:
         self._client.__enter__()
         return self
 
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/_vendor.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/_vendor.py
deleted file mode 100644
index 0dafe0e287ff..000000000000
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/_vendor.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# --------------------------------------------------------------------------
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License. See License.txt in the project root for license information.
-# Code generated by Microsoft (R) AutoRest Code Generator.
-# Changes may cause incorrect behavior and will be lost if the code is regenerated.
-# --------------------------------------------------------------------------
-
-from azure.core.pipeline.transport import HttpRequest
-
-
-def _convert_request(request, files=None):
-    data = request.content if not files else None
-    request = HttpRequest(method=request.method, url=request.url, headers=request.headers, data=data)
-    if files:
-        request.set_formdata_body(files)
-    return request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/_version.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/_version.py
index 5a163c0afedc..e5754a47ce68 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/_version.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/_version.py
@@ -6,4 +6,4 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-VERSION = "21.2.1"
\ No newline at end of file
+VERSION = "1.0.0b1"
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/__init__.py
index a5c3d2414cfd..ee2b940bd4fc 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/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 ._storage_management_client import StorageManagementClient
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._storage_management_client import StorageManagementClient  # 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__ = [
     "StorageManagementClient",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/_configuration.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/_configuration.py
index ec66fb14632d..e722170b52be 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/_configuration.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/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 StorageManagementClientConfiguration:  # pylint: disable=too-many-instance-attributes,name-too-long
+class StorageManagementClientConfiguration:  # pylint: disable=too-many-instance-attributes
     """Configuration for StorageManagementClient.
 
     Note that all parameters used to create this instance are saved as instance
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/_storage_management_client.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/_storage_management_client.py
index b92ea86627c1..a651b415aab7 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/_storage_management_client.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/_storage_management_client.py
@@ -8,6 +8,7 @@
 
 from copy import deepcopy
 from typing import Any, Awaitable, TYPE_CHECKING
+from typing_extensions import Self
 
 from azure.core.pipeline import policies
 from azure.core.rest import AsyncHttpResponse, HttpRequest
@@ -41,11 +42,10 @@
 )
 
 if TYPE_CHECKING:
-    # pylint: disable=unused-import,ungrouped-imports
     from azure.core.credentials_async import AsyncTokenCredential
 
 
-class StorageManagementClient:  # pylint: disable=client-accepts-api-version-keyword,too-many-instance-attributes
+class StorageManagementClient:  # pylint: disable=too-many-instance-attributes
     """The Azure Storage Management API.
 
     :ivar operations: Operations operations
@@ -222,7 +222,7 @@ def _send_request(
     async def close(self) -> None:
         await self._client.close()
 
-    async def __aenter__(self) -> "StorageManagementClient":
+    async def __aenter__(self) -> Self:
         await self._client.__aenter__()
         return self
 
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/operations/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/operations/__init__.py
index bbce85749d18..a0549517e087 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/operations/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/operations/__init__.py
@@ -5,30 +5,36 @@
 # 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 ._skus_operations import SkusOperations
-from ._storage_accounts_operations import StorageAccountsOperations
-from ._deleted_accounts_operations import DeletedAccountsOperations
-from ._usages_operations import UsagesOperations
-from ._management_policies_operations import ManagementPoliciesOperations
-from ._blob_inventory_policies_operations import BlobInventoryPoliciesOperations
-from ._private_endpoint_connections_operations import PrivateEndpointConnectionsOperations
-from ._private_link_resources_operations import PrivateLinkResourcesOperations
-from ._object_replication_policies_operations import ObjectReplicationPoliciesOperations
-from ._local_users_operations import LocalUsersOperations
-from ._encryption_scopes_operations import EncryptionScopesOperations
-from ._blob_services_operations import BlobServicesOperations
-from ._blob_containers_operations import BlobContainersOperations
-from ._file_services_operations import FileServicesOperations
-from ._file_shares_operations import FileSharesOperations
-from ._queue_services_operations import QueueServicesOperations
-from ._queue_operations import QueueOperations
-from ._table_services_operations import TableServicesOperations
-from ._table_operations import TableOperations
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._operations import Operations  # type: ignore
+from ._skus_operations import SkusOperations  # type: ignore
+from ._storage_accounts_operations import StorageAccountsOperations  # type: ignore
+from ._deleted_accounts_operations import DeletedAccountsOperations  # type: ignore
+from ._usages_operations import UsagesOperations  # type: ignore
+from ._management_policies_operations import ManagementPoliciesOperations  # type: ignore
+from ._blob_inventory_policies_operations import BlobInventoryPoliciesOperations  # type: ignore
+from ._private_endpoint_connections_operations import PrivateEndpointConnectionsOperations  # type: ignore
+from ._private_link_resources_operations import PrivateLinkResourcesOperations  # type: ignore
+from ._object_replication_policies_operations import ObjectReplicationPoliciesOperations  # type: ignore
+from ._local_users_operations import LocalUsersOperations  # type: ignore
+from ._encryption_scopes_operations import EncryptionScopesOperations  # type: ignore
+from ._blob_services_operations import BlobServicesOperations  # type: ignore
+from ._blob_containers_operations import BlobContainersOperations  # type: ignore
+from ._file_services_operations import FileServicesOperations  # type: ignore
+from ._file_shares_operations import FileSharesOperations  # type: ignore
+from ._queue_services_operations import QueueServicesOperations  # type: ignore
+from ._queue_operations import QueueOperations  # type: ignore
+from ._table_services_operations import TableServicesOperations  # type: ignore
+from ._table_operations import TableOperations  # 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__ = [
@@ -53,5 +59,5 @@
     "TableServicesOperations",
     "TableOperations",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/operations/_blob_containers_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/operations/_blob_containers_operations.py
index 609bf13aeb4a..acfab49f84ca 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/operations/_blob_containers_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/operations/_blob_containers_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,20 @@
 # --------------------------------------------------------------------------
 from io import IOBase
 import sys
-from typing import Any, AsyncIterable, Callable, Dict, IO, Literal, Optional, Type, TypeVar, Union, cast, overload
+from typing import (
+    Any,
+    AsyncIterable,
+    AsyncIterator,
+    Callable,
+    Dict,
+    IO,
+    Literal,
+    Optional,
+    TypeVar,
+    Union,
+    cast,
+    overload,
+)
 import urllib.parse
 
 from azure.core.async_paging import AsyncItemPaged, AsyncList
@@ -18,12 +31,13 @@
     ResourceExistsError,
     ResourceNotFoundError,
     ResourceNotModifiedError,
+    StreamClosedError,
+    StreamConsumedError,
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
 from azure.core.polling import AsyncLROPoller, AsyncNoPolling, AsyncPollingMethod
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
@@ -31,7 +45,6 @@
 from azure.mgmt.core.polling.async_arm_polling import AsyncARMPolling
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._blob_containers_operations import (
     build_clear_legal_hold_request,
     build_create_or_update_immutability_policy_request,
@@ -52,7 +65,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]]
 
@@ -117,7 +130,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-01-01"))
         cls: ClsType[_models.ListContainerItems] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -139,7 +152,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -155,7 +167,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -290,7 +301,7 @@ async def create(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -325,7 +336,6 @@ async def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -339,11 +349,7 @@ async def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("BlobContainer", pipeline_response)
-
-        if response.status_code == 201:
-            deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -453,7 +459,7 @@ async def update(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -488,7 +494,6 @@ async def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -502,7 +507,7 @@ async def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -531,7 +536,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -554,7 +559,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -568,7 +572,7 @@ async def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -576,9 +580,7 @@ async def get(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, container_name: str, **kwargs: Any
-    ) -> None:
+    async def delete(self, resource_group_name: str, account_name: str, container_name: str, **kwargs: Any) -> None:
         """Deletes specified container under its account.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -597,7 +599,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,
@@ -620,7 +622,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -743,7 +744,7 @@ async def set_legal_hold(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.LegalHold
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -778,7 +779,6 @@ async def set_legal_hold(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -792,7 +792,7 @@ async def set_legal_hold(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LegalHold", pipeline_response)
+        deserialized = self._deserialize("LegalHold", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -902,7 +902,7 @@ async def clear_legal_hold(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.LegalHold
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -937,7 +937,6 @@ async def clear_legal_hold(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -951,7 +950,7 @@ async def clear_legal_hold(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LegalHold", pipeline_response)
+        deserialized = self._deserialize("LegalHold", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1078,7 +1077,7 @@ async def create_or_update_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1119,7 +1118,6 @@ async def create_or_update_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1136,7 +1134,7 @@ async def create_or_update_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1175,7 +1173,7 @@ async def get_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1201,7 +1199,6 @@ async def get_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1218,7 +1215,7 @@ async def get_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1254,7 +1251,7 @@ async def delete_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1280,7 +1277,6 @@ async def delete_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1297,7 +1293,7 @@ async def delete_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1331,7 +1327,7 @@ async def lock_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1355,7 +1351,6 @@ async def lock_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1372,7 +1367,7 @@ async def lock_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1502,7 +1497,7 @@ async def extend_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1541,7 +1536,6 @@ async def extend_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1558,7 +1552,7 @@ async def extend_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1668,7 +1662,7 @@ async def lease(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.LeaseContainerResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1706,7 +1700,6 @@ async def lease(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1720,17 +1713,17 @@ async def lease(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LeaseContainerResponse", pipeline_response)
+        deserialized = self._deserialize("LeaseContainerResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
 
         return deserialized  # type: ignore
 
-    async def _object_level_worm_initial(  # pylint: disable=inconsistent-return-statements
+    async def _object_level_worm_initial(
         self, resource_group_name: str, account_name: str, container_name: str, **kwargs: Any
-    ) -> None:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1742,7 +1735,7 @@ async def _object_level_worm_initial(  # pylint: disable=inconsistent-return-sta
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-01-01"))
-        cls: ClsType[None] = kwargs.pop("cls", None)
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
 
         _request = build_object_level_worm_request(
             resource_group_name=resource_group_name,
@@ -1753,10 +1746,10 @@ async def _object_level_worm_initial(  # pylint: disable=inconsistent-return-sta
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -1764,11 +1757,19 @@ async def _object_level_worm_initial(  # pylint: disable=inconsistent-return-sta
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
-            return cls(pipeline_response, None, {})  # type: ignore
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
 
     @distributed_trace_async
     async def begin_object_level_worm(
@@ -1804,7 +1805,7 @@ async def begin_object_level_worm(
         lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
         cont_token: Optional[str] = kwargs.pop("continuation_token", None)
         if cont_token is None:
-            raw_result = await self._object_level_worm_initial(  # type: ignore
+            raw_result = await self._object_level_worm_initial(
                 resource_group_name=resource_group_name,
                 account_name=account_name,
                 container_name=container_name,
@@ -1814,6 +1815,7 @@ async def begin_object_level_worm(
                 params=_params,
                 **kwargs
             )
+            await raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/operations/_blob_inventory_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/operations/_blob_inventory_policies_operations.py
index e7b4a5128f2c..d0b958882415 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/operations/_blob_inventory_policies_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/operations/_blob_inventory_policies_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._blob_inventory_policies_operations import (
     build_create_or_update_request,
     build_delete_request,
@@ -40,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]]
 
@@ -90,7 +87,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.BlobInventoryPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -113,7 +110,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -127,7 +123,7 @@ async def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response)
+        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -231,7 +227,7 @@ async def create_or_update(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.BlobInventoryPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -266,7 +262,6 @@ async def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -280,7 +275,7 @@ async def create_or_update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response)
+        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -288,7 +283,7 @@ async def create_or_update(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
+    async def delete(
         self,
         resource_group_name: str,
         account_name: str,
@@ -312,7 +307,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,
@@ -335,7 +330,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -376,7 +370,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-01-01"))
         cls: ClsType[_models.ListBlobInventoryPolicy] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -395,7 +389,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -411,7 +404,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/operations/_blob_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/operations/_blob_services_operations.py
index 8e56182c22ce..08b563443a16 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/operations/_blob_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/operations/_blob_services_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, Literal, Optional, Type, TypeVar, Union, overload
+from typing import Any, AsyncIterable, Callable, Dict, IO, Literal, Optional, TypeVar, Union, overload
 import urllib.parse
 
 from azure.core.async_paging import AsyncItemPaged, AsyncList
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._blob_services_operations import (
     build_get_service_properties_request,
     build_list_request,
@@ -39,7 +36,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 +86,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-01-01"))
         cls: ClsType[_models.BlobServiceItems] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -108,7 +105,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -124,7 +120,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -241,7 +236,7 @@ async def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.BlobServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -277,7 +272,6 @@ async def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -291,7 +285,7 @@ async def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobServiceProperties", pipeline_response)
+        deserialized = self._deserialize("BlobServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -316,7 +310,7 @@ async def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.BlobServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -340,7 +334,6 @@ async def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -354,7 +347,7 @@ async def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobServiceProperties", pipeline_response)
+        deserialized = self._deserialize("BlobServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/operations/_deleted_accounts_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/operations/_deleted_accounts_operations.py
index c6b0f623c4fe..c924280d553b 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/operations/_deleted_accounts_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/operations/_deleted_accounts_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
@@ -20,21 +19,19 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._deleted_accounts_operations import build_get_request, build_list_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
 
@@ -74,7 +71,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.DeletedAccount"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-01-01"))
         cls: ClsType[_models.DeletedAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -91,7 +88,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -107,7 +103,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -149,7 +144,7 @@ async def get(self, deleted_account_name: str, location: str, **kwargs: Any) ->
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.DeletedAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -171,7 +166,6 @@ async def get(self, deleted_account_name: str, location: str, **kwargs: Any) ->
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -186,7 +180,7 @@ async def get(self, deleted_account_name: str, location: str, **kwargs: Any) ->
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("DeletedAccount", pipeline_response)
+        deserialized = self._deserialize("DeletedAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/operations/_encryption_scopes_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/operations/_encryption_scopes_operations.py
index ebabd468b62e..e548a6deed7f 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/operations/_encryption_scopes_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/operations/_encryption_scopes_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._encryption_scopes_operations import (
     build_get_request,
     build_list_request,
@@ -40,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]]
 
@@ -173,7 +170,7 @@ async def put(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.EncryptionScope
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -208,7 +205,6 @@ async def put(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -223,11 +219,7 @@ async def put(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("EncryptionScope", pipeline_response)
-
-        if response.status_code == 201:
-            deserialized = self._deserialize("EncryptionScope", pipeline_response)
+        deserialized = self._deserialize("EncryptionScope", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -337,7 +329,7 @@ async def patch(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.EncryptionScope
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -372,7 +364,6 @@ async def patch(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -387,7 +378,7 @@ async def patch(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("EncryptionScope", pipeline_response)
+        deserialized = self._deserialize("EncryptionScope", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -416,7 +407,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.EncryptionScope
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -439,7 +430,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -454,7 +444,7 @@ async def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("EncryptionScope", pipeline_response)
+        deserialized = self._deserialize("EncryptionScope", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -500,7 +490,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-01-01"))
         cls: ClsType[_models.EncryptionScopeListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -522,7 +512,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -538,7 +527,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/operations/_file_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/operations/_file_services_operations.py
index ec0d02d3c212..f346e86578db 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/operations/_file_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/operations/_file_services_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, Literal, Optional, Type, TypeVar, Union, overload
+from typing import Any, Callable, Dict, IO, Literal, Optional, TypeVar, Union, overload
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -19,14 +18,12 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._file_services_operations import (
     build_get_service_properties_request,
     build_list_request,
@@ -36,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]]
 
@@ -76,7 +73,7 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.FileServiceItems
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -98,7 +95,6 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -112,7 +108,7 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileServiceItems", pipeline_response)
+        deserialized = self._deserialize("FileServiceItems", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -207,7 +203,7 @@ async def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.FileServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -243,7 +239,6 @@ async def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -257,7 +252,7 @@ async def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileServiceProperties", pipeline_response)
+        deserialized = self._deserialize("FileServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -282,7 +277,7 @@ async def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.FileServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -306,7 +301,6 @@ async def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -320,7 +314,7 @@ async def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileServiceProperties", pipeline_response)
+        deserialized = self._deserialize("FileServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/operations/_file_shares_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/operations/_file_shares_operations.py
index 3df4714f2ab4..2161463b5a2f 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/operations/_file_shares_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/operations/_file_shares_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._file_shares_operations import (
     build_create_request,
     build_delete_request,
@@ -43,7 +40,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]]
 
@@ -108,7 +105,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-01-01"))
         cls: ClsType[_models.FileShareItems] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -130,7 +127,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -146,7 +142,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -293,7 +288,7 @@ async def create(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.FileShare
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -329,7 +324,6 @@ async def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -343,11 +337,7 @@ async def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("FileShare", pipeline_response)
-
-        if response.status_code == 201:
-            deserialized = self._deserialize("FileShare", pipeline_response)
+        deserialized = self._deserialize("FileShare", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -457,7 +447,7 @@ async def update(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.FileShare
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -492,7 +482,6 @@ async def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -506,7 +495,7 @@ async def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileShare", pipeline_response)
+        deserialized = self._deserialize("FileShare", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -547,7 +536,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.FileShare
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -572,7 +561,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -586,7 +574,7 @@ async def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileShare", pipeline_response)
+        deserialized = self._deserialize("FileShare", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -594,7 +582,7 @@ async def get(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
+    async def delete(
         self,
         resource_group_name: str,
         account_name: str,
@@ -631,7 +619,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,
@@ -656,7 +644,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -674,7 +661,7 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             return cls(pipeline_response, None, {})  # type: ignore
 
     @overload
-    async def restore(  # pylint: disable=inconsistent-return-statements
+    async def restore(
         self,
         resource_group_name: str,
         account_name: str,
@@ -709,7 +696,7 @@ async def restore(  # pylint: disable=inconsistent-return-statements
         """
 
     @overload
-    async def restore(  # pylint: disable=inconsistent-return-statements
+    async def restore(
         self,
         resource_group_name: str,
         account_name: str,
@@ -744,7 +731,7 @@ async def restore(  # pylint: disable=inconsistent-return-statements
         """
 
     @distributed_trace_async
-    async def restore(  # pylint: disable=inconsistent-return-statements
+    async def restore(
         self,
         resource_group_name: str,
         account_name: str,
@@ -772,7 +759,7 @@ async def restore(  # 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,
@@ -807,7 +794,6 @@ async def restore(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -939,7 +925,7 @@ async def lease(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.LeaseShareResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -978,7 +964,6 @@ async def lease(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -995,7 +980,7 @@ async def lease(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("LeaseShareResponse", pipeline_response)
+        deserialized = self._deserialize("LeaseShareResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/operations/_local_users_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/operations/_local_users_operations.py
index 9247f364aa52..b498d9a6674a 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/operations/_local_users_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/operations/_local_users_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._local_users_operations import (
     build_create_or_update_request,
     build_delete_request,
@@ -42,7 +39,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 +86,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> As
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-01-01"))
         cls: ClsType[_models.LocalUsers] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -108,7 +105,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -124,7 +120,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -172,7 +167,7 @@ async def get(self, resource_group_name: str, account_name: str, username: str,
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.LocalUser
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -195,7 +190,6 @@ async def get(self, resource_group_name: str, account_name: str, username: str,
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -210,7 +204,7 @@ async def get(self, resource_group_name: str, account_name: str, username: str,
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LocalUser", pipeline_response)
+        deserialized = self._deserialize("LocalUser", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -311,7 +305,7 @@ async def create_or_update(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.LocalUser
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -346,7 +340,6 @@ async def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -361,7 +354,7 @@ async def create_or_update(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LocalUser", pipeline_response)
+        deserialized = self._deserialize("LocalUser", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -369,9 +362,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, account_name: str, username: str, **kwargs: Any
-    ) -> None:
+    async def delete(self, resource_group_name: str, account_name: str, username: str, **kwargs: Any) -> None:
         """Deletes the local user associated with the specified storage account.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -388,7 +379,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,
@@ -411,7 +402,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -449,7 +439,7 @@ async def list_keys(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.LocalUserKeys
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -472,7 +462,6 @@ async def list_keys(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -487,7 +476,7 @@ async def list_keys(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LocalUserKeys", pipeline_response)
+        deserialized = self._deserialize("LocalUserKeys", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -514,7 +503,7 @@ async def regenerate_password(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.LocalUserRegeneratePasswordResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -537,7 +526,6 @@ async def regenerate_password(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -552,7 +540,7 @@ async def regenerate_password(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LocalUserRegeneratePasswordResult", pipeline_response)
+        deserialized = self._deserialize("LocalUserRegeneratePasswordResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/operations/_management_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/operations/_management_policies_operations.py
index 85238c6c925d..bf769be355d4 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/operations/_management_policies_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/operations/_management_policies_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,
@@ -19,14 +18,12 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._management_policies_operations import (
     build_create_or_update_request,
     build_delete_request,
@@ -36,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]]
 
@@ -86,7 +83,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.ManagementPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -109,7 +106,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -123,7 +119,7 @@ async def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ManagementPolicy", pipeline_response)
+        deserialized = self._deserialize("ManagementPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -227,7 +223,7 @@ async def create_or_update(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.ManagementPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -262,7 +258,6 @@ async def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -276,7 +271,7 @@ async def create_or_update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ManagementPolicy", pipeline_response)
+        deserialized = self._deserialize("ManagementPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -284,7 +279,7 @@ async def create_or_update(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
+    async def delete(
         self,
         resource_group_name: str,
         account_name: str,
@@ -308,7 +303,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,
@@ -331,7 +326,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/operations/_object_replication_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/operations/_object_replication_policies_operations.py
index 0bfccfc3eb83..62bab8824dc8 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/operations/_object_replication_policies_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/operations/_object_replication_policies_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._object_replication_policies_operations import (
     build_create_or_update_request,
     build_delete_request,
@@ -40,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]]
 
@@ -90,7 +87,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-01-01"))
         cls: ClsType[_models.ObjectReplicationPolicies] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -109,7 +106,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -125,7 +121,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -177,7 +172,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.ObjectReplicationPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -200,7 +195,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -215,7 +209,7 @@ async def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response)
+        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -325,7 +319,7 @@ async def create_or_update(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.ObjectReplicationPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -360,7 +354,6 @@ async def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -375,7 +368,7 @@ async def create_or_update(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response)
+        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -383,7 +376,7 @@ async def create_or_update(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
+    async def delete(
         self, resource_group_name: str, account_name: str, object_replication_policy_id: str, **kwargs: Any
     ) -> None:
         """Deletes the object replication policy associated with the specified storage account.
@@ -404,7 +397,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,
@@ -427,7 +420,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/operations/_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/operations/_operations.py
index 340332958f52..d2d07edf6f7a 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/operations/_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/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
@@ -20,20 +19,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._operations import build_list_request
 
 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]]
 
@@ -73,7 +70,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.Operation"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-01-01"))
         cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -89,7 +86,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -105,7 +101,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/operations/_private_endpoint_connections_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/operations/_private_endpoint_connections_operations.py
index dc039cadea50..21ad016c64d7 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/operations/_private_endpoint_connections_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/operations/_private_endpoint_connections_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._private_endpoint_connections_operations import (
     build_delete_request,
     build_get_request,
@@ -40,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]]
 
@@ -90,7 +87,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-01-01"))
         cls: ClsType[_models.PrivateEndpointConnectionListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -109,7 +106,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -125,7 +121,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -174,7 +169,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.PrivateEndpointConnection
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -197,7 +192,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -212,7 +206,7 @@ async def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response)
+        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -313,7 +307,7 @@ async def put(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.PrivateEndpointConnection
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -348,7 +342,6 @@ async def put(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -363,7 +356,7 @@ async def put(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response)
+        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -371,7 +364,7 @@ async def put(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
+    async def delete(
         self, resource_group_name: str, account_name: str, private_endpoint_connection_name: str, **kwargs: Any
     ) -> None:
         """Deletes the specified private endpoint connection associated with the storage account.
@@ -390,7 +383,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,
@@ -413,7 +406,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/operations/_private_link_resources_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/operations/_private_link_resources_operations.py
index a53c1e3b2ba9..f230b455f371 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/operations/_private_link_resources_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/operations/_private_link_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, Optional, Type, TypeVar
+from typing import Any, Callable, Dict, Optional, TypeVar
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -18,20 +17,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._private_link_resources_operations import build_list_by_storage_account_request
 
 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]]
 
@@ -73,7 +70,7 @@ async def list_by_storage_account(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.PrivateLinkResourceListResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -95,7 +92,6 @@ async def list_by_storage_account(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -109,7 +105,7 @@ async def list_by_storage_account(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("PrivateLinkResourceListResult", pipeline_response)
+        deserialized = self._deserialize("PrivateLinkResourceListResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/operations/_queue_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/operations/_queue_operations.py
index 76048ac11b4a..1c74dc389576 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/operations/_queue_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/operations/_queue_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._queue_operations import (
     build_create_request,
     build_delete_request,
@@ -41,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]]
 
@@ -166,7 +163,7 @@ async def create(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.StorageQueue
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -201,7 +198,6 @@ async def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -215,7 +211,7 @@ async def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageQueue", pipeline_response)
+        deserialized = self._deserialize("StorageQueue", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -322,7 +318,7 @@ async def update(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.StorageQueue
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -357,7 +353,6 @@ async def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -371,7 +366,7 @@ async def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageQueue", pipeline_response)
+        deserialized = self._deserialize("StorageQueue", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -400,7 +395,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.StorageQueue
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -423,7 +418,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -437,7 +431,7 @@ async def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageQueue", pipeline_response)
+        deserialized = self._deserialize("StorageQueue", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -445,9 +439,7 @@ async def get(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, queue_name: str, **kwargs: Any
-    ) -> None:
+    async def delete(self, resource_group_name: str, account_name: str, queue_name: str, **kwargs: Any) -> None:
         """Deletes the queue with the specified queue name, under the specified account if it exists.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -466,7 +458,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,
@@ -489,7 +481,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -541,7 +532,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-01-01"))
         cls: ClsType[_models.ListQueueResource] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -562,7 +553,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -578,7 +568,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/operations/_queue_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/operations/_queue_services_operations.py
index 86a21a059a17..603b2b741b73 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/operations/_queue_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/operations/_queue_services_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, Literal, Optional, Type, TypeVar, Union, overload
+from typing import Any, Callable, Dict, IO, Literal, Optional, TypeVar, Union, overload
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -19,14 +18,12 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._queue_services_operations import (
     build_get_service_properties_request,
     build_list_request,
@@ -36,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]]
 
@@ -76,7 +73,7 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.ListQueueServices
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -98,7 +95,6 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -112,7 +108,7 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListQueueServices", pipeline_response)
+        deserialized = self._deserialize("ListQueueServices", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -207,7 +203,7 @@ async def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.QueueServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -243,7 +239,6 @@ async def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -257,7 +252,7 @@ async def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("QueueServiceProperties", pipeline_response)
+        deserialized = self._deserialize("QueueServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -282,7 +277,7 @@ async def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.QueueServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -306,7 +301,6 @@ async def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -320,7 +314,7 @@ async def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("QueueServiceProperties", pipeline_response)
+        deserialized = self._deserialize("QueueServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/operations/_skus_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/operations/_skus_operations.py
index c3a1cda8c096..f1e74725626a 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/operations/_skus_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/operations/_skus_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
@@ -20,20 +19,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._skus_operations import build_list_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
 
@@ -73,7 +70,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.SkuInformation"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-01-01"))
         cls: ClsType[_models.StorageSkuListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -90,7 +87,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -106,7 +102,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/operations/_storage_accounts_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/operations/_storage_accounts_operations.py
index 0ca5cfed9747..e00c2fcaaf01 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/operations/_storage_accounts_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/operations/_storage_accounts_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,20 @@
 # --------------------------------------------------------------------------
 from io import IOBase
 import sys
-from typing import Any, AsyncIterable, Callable, Dict, IO, Literal, Optional, Type, TypeVar, Union, cast, overload
+from typing import (
+    Any,
+    AsyncIterable,
+    AsyncIterator,
+    Callable,
+    Dict,
+    IO,
+    Literal,
+    Optional,
+    TypeVar,
+    Union,
+    cast,
+    overload,
+)
 import urllib.parse
 
 from azure.core.async_paging import AsyncItemPaged, AsyncList
@@ -18,12 +31,13 @@
     ResourceExistsError,
     ResourceNotFoundError,
     ResourceNotModifiedError,
+    StreamClosedError,
+    StreamConsumedError,
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
 from azure.core.polling import AsyncLROPoller, AsyncNoPolling, AsyncPollingMethod
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
@@ -31,7 +45,6 @@
 from azure.mgmt.core.polling.async_arm_polling import AsyncARMPolling
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._storage_accounts_operations import (
     build_abort_hierarchical_namespace_migration_request,
     build_check_name_availability_request,
@@ -56,7 +69,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]]
 
@@ -139,7 +152,7 @@ async def check_name_availability(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.CheckNameAvailabilityResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -171,7 +184,6 @@ async def check_name_availability(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -185,7 +197,7 @@ async def check_name_availability(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response)
+        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -198,8 +210,8 @@ async def _create_initial(
         account_name: str,
         parameters: Union[_models.StorageAccountCreateParameters, IO[bytes]],
         **kwargs: Any
-    ) -> Optional[_models.StorageAccount]:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -212,7 +224,7 @@ async def _create_initial(
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-01-01"))
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
-        cls: ClsType[Optional[_models.StorageAccount]] = kwargs.pop("cls", None)
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
         _json = None
@@ -233,10 +245,10 @@ async def _create_initial(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -244,12 +256,14 @@ async def _create_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = None
-        if response.status_code == 200:
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -375,10 +389,11 @@ async def begin_create(
                 params=_params,
                 **kwargs
             )
+            await raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+            deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
             if cls:
                 return cls(pipeline_response, deserialized, {})  # type: ignore
             return deserialized
@@ -401,9 +416,7 @@ def get_long_running_output(pipeline_response):
         )
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, **kwargs: Any
-    ) -> None:
+    async def delete(self, resource_group_name: str, account_name: str, **kwargs: Any) -> None:
         """Deletes a storage account in Microsoft Azure.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -417,7 +430,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,
@@ -439,7 +452,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -484,7 +496,7 @@ async def get_properties(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -507,7 +519,6 @@ async def get_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -521,7 +532,7 @@ async def get_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -632,7 +643,7 @@ async def update(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -666,7 +677,6 @@ async def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -680,7 +690,7 @@ async def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -703,7 +713,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.StorageAccount"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-01-01"))
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -720,7 +730,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -736,7 +745,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -786,7 +794,7 @@ def list_by_resource_group(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-01-01"))
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -804,7 +812,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -820,7 +827,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -870,7 +876,7 @@ async def list_keys(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.StorageAccountListKeysResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -893,7 +899,6 @@ async def list_keys(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -907,7 +912,7 @@ async def list_keys(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response)
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1001,7 +1006,7 @@ async def regenerate_key(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.StorageAccountListKeysResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1035,7 +1040,6 @@ async def regenerate_key(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1049,7 +1053,7 @@ async def regenerate_key(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response)
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1140,7 +1144,7 @@ async def list_account_sas(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.ListAccountSasResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1174,7 +1178,6 @@ async def list_account_sas(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1188,7 +1191,7 @@ async def list_account_sas(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListAccountSasResponse", pipeline_response)
+        deserialized = self._deserialize("ListAccountSasResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1277,7 +1280,7 @@ async def list_service_sas(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.ListServiceSasResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1311,7 +1314,6 @@ async def list_service_sas(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1325,17 +1327,17 @@ async def list_service_sas(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListServiceSasResponse", pipeline_response)
+        deserialized = self._deserialize("ListServiceSasResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
 
         return deserialized  # type: ignore
 
-    async def _failover_initial(  # pylint: disable=inconsistent-return-statements
+    async def _failover_initial(
         self, resource_group_name: str, account_name: str, failover_type: Literal["Planned"] = "Planned", **kwargs: Any
-    ) -> None:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1347,7 +1349,7 @@ async def _failover_initial(  # pylint: disable=inconsistent-return-statements
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-01-01"))
-        cls: ClsType[None] = kwargs.pop("cls", None)
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
 
         _request = build_failover_request(
             resource_group_name=resource_group_name,
@@ -1358,10 +1360,10 @@ async def _failover_initial(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -1369,11 +1371,19 @@ async def _failover_initial(  # pylint: disable=inconsistent-return-statements
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
-            return cls(pipeline_response, None, {})  # type: ignore
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
 
     @distributed_trace_async
     async def begin_failover(
@@ -1414,7 +1424,7 @@ async def begin_failover(
         lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
         cont_token: Optional[str] = kwargs.pop("continuation_token", None)
         if cont_token is None:
-            raw_result = await self._failover_initial(  # type: ignore
+            raw_result = await self._failover_initial(
                 resource_group_name=resource_group_name,
                 account_name=account_name,
                 failover_type=failover_type,
@@ -1424,6 +1434,7 @@ async def begin_failover(
                 params=_params,
                 **kwargs
             )
+            await raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
@@ -1447,10 +1458,10 @@ def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-
             )
         return AsyncLROPoller[None](self._client, raw_result, get_long_running_output, polling_method)  # type: ignore
 
-    async def _hierarchical_namespace_migration_initial(  # pylint: disable=inconsistent-return-statements,name-too-long
+    async def _hierarchical_namespace_migration_initial(  # pylint: disable=name-too-long
         self, resource_group_name: str, account_name: str, request_type: str, **kwargs: Any
-    ) -> None:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1462,7 +1473,7 @@ async def _hierarchical_namespace_migration_initial(  # pylint: disable=inconsis
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-01-01"))
-        cls: ClsType[None] = kwargs.pop("cls", None)
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
 
         _request = build_hierarchical_namespace_migration_request(
             resource_group_name=resource_group_name,
@@ -1473,10 +1484,10 @@ async def _hierarchical_namespace_migration_initial(  # pylint: disable=inconsis
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -1484,12 +1495,20 @@ async def _hierarchical_namespace_migration_initial(  # pylint: disable=inconsis
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
-            return cls(pipeline_response, None, {})  # type: ignore
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
 
     @distributed_trace_async
     async def begin_hierarchical_namespace_migration(
@@ -1522,7 +1541,7 @@ async def begin_hierarchical_namespace_migration(
         lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
         cont_token: Optional[str] = kwargs.pop("continuation_token", None)
         if cont_token is None:
-            raw_result = await self._hierarchical_namespace_migration_initial(  # type: ignore
+            raw_result = await self._hierarchical_namespace_migration_initial(
                 resource_group_name=resource_group_name,
                 account_name=account_name,
                 request_type=request_type,
@@ -1532,6 +1551,7 @@ async def begin_hierarchical_namespace_migration(
                 params=_params,
                 **kwargs
             )
+            await raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
@@ -1555,10 +1575,10 @@ def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-
             )
         return AsyncLROPoller[None](self._client, raw_result, get_long_running_output, polling_method)  # type: ignore
 
-    async def _abort_hierarchical_namespace_migration_initial(  # pylint: disable=inconsistent-return-statements,name-too-long
+    async def _abort_hierarchical_namespace_migration_initial(  # pylint: disable=name-too-long
         self, resource_group_name: str, account_name: str, **kwargs: Any
-    ) -> None:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1570,7 +1590,7 @@ async def _abort_hierarchical_namespace_migration_initial(  # pylint: disable=in
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-01-01"))
-        cls: ClsType[None] = kwargs.pop("cls", None)
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
 
         _request = build_abort_hierarchical_namespace_migration_request(
             resource_group_name=resource_group_name,
@@ -1580,10 +1600,10 @@ async def _abort_hierarchical_namespace_migration_initial(  # pylint: disable=in
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -1591,12 +1611,20 @@ async def _abort_hierarchical_namespace_migration_initial(  # pylint: disable=in
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
-            return cls(pipeline_response, None, {})  # type: ignore
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
 
     @distributed_trace_async
     async def begin_abort_hierarchical_namespace_migration(  # pylint: disable=name-too-long
@@ -1624,7 +1652,7 @@ async def begin_abort_hierarchical_namespace_migration(  # pylint: disable=name-
         lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
         cont_token: Optional[str] = kwargs.pop("continuation_token", None)
         if cont_token is None:
-            raw_result = await self._abort_hierarchical_namespace_migration_initial(  # type: ignore
+            raw_result = await self._abort_hierarchical_namespace_migration_initial(
                 resource_group_name=resource_group_name,
                 account_name=account_name,
                 api_version=api_version,
@@ -1633,6 +1661,7 @@ async def begin_abort_hierarchical_namespace_migration(  # pylint: disable=name-
                 params=_params,
                 **kwargs
             )
+            await raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
@@ -1656,14 +1685,14 @@ def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-
             )
         return AsyncLROPoller[None](self._client, raw_result, get_long_running_output, polling_method)  # type: ignore
 
-    async def _customer_initiated_migration_initial(  # pylint: disable=inconsistent-return-statements
+    async def _customer_initiated_migration_initial(
         self,
         resource_group_name: str,
         account_name: str,
         parameters: Union[_models.StorageAccountMigration, IO[bytes]],
         **kwargs: Any
-    ) -> None:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1676,7 +1705,7 @@ async def _customer_initiated_migration_initial(  # pylint: disable=inconsistent
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-01-01"))
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
-        cls: ClsType[None] = kwargs.pop("cls", None)
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
         _json = None
@@ -1697,10 +1726,10 @@ async def _customer_initiated_migration_initial(  # pylint: disable=inconsistent
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -1708,6 +1737,10 @@ async def _customer_initiated_migration_initial(  # pylint: disable=inconsistent
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponseAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
@@ -1716,8 +1749,12 @@ async def _customer_initiated_migration_initial(  # pylint: disable=inconsistent
         if response.status_code == 202:
             response_headers["Location"] = self._deserialize("str", response.headers.get("Location"))
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
-            return cls(pipeline_response, None, response_headers)  # type: ignore
+            return cls(pipeline_response, deserialized, response_headers)  # type: ignore
+
+        return deserialized  # type: ignore
 
     @overload
     async def begin_customer_initiated_migration(
@@ -1825,7 +1862,7 @@ async def begin_customer_initiated_migration(
         lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
         cont_token: Optional[str] = kwargs.pop("continuation_token", None)
         if cont_token is None:
-            raw_result = await self._customer_initiated_migration_initial(  # type: ignore
+            raw_result = await self._customer_initiated_migration_initial(
                 resource_group_name=resource_group_name,
                 account_name=account_name,
                 parameters=parameters,
@@ -1836,6 +1873,7 @@ async def begin_customer_initiated_migration(
                 params=_params,
                 **kwargs
             )
+            await raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
@@ -1883,7 +1921,7 @@ async def get_customer_initiated_migration(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.StorageAccountMigration
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1906,7 +1944,6 @@ async def get_customer_initiated_migration(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1921,7 +1958,7 @@ async def get_customer_initiated_migration(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponseAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountMigration", pipeline_response)
+        deserialized = self._deserialize("StorageAccountMigration", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1934,8 +1971,8 @@ async def _restore_blob_ranges_initial(
         account_name: str,
         parameters: Union[_models.BlobRestoreParameters, IO[bytes]],
         **kwargs: Any
-    ) -> _models.BlobRestoreStatus:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1948,7 +1985,7 @@ async def _restore_blob_ranges_initial(
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-01-01"))
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
-        cls: ClsType[_models.BlobRestoreStatus] = kwargs.pop("cls", None)
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
         _json = None
@@ -1969,10 +2006,10 @@ async def _restore_blob_ranges_initial(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -1980,14 +2017,14 @@ async def _restore_blob_ranges_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response)
-
-        if response.status_code == 202:
-            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response)
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -2103,10 +2140,11 @@ async def begin_restore_blob_ranges(
                 params=_params,
                 **kwargs
             )
+            await raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):
-            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response)
+            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response.http_response)
             if cls:
                 return cls(pipeline_response, deserialized, {})  # type: ignore
             return deserialized
@@ -2131,9 +2169,7 @@ def get_long_running_output(pipeline_response):
         )
 
     @distributed_trace_async
-    async def revoke_user_delegation_keys(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, **kwargs: Any
-    ) -> None:
+    async def revoke_user_delegation_keys(self, resource_group_name: str, account_name: str, **kwargs: Any) -> None:
         """Revoke user delegation keys.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -2147,7 +2183,7 @@ async def revoke_user_delegation_keys(  # pylint: disable=inconsistent-return-st
         :rtype: None
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -2169,7 +2205,6 @@ async def revoke_user_delegation_keys(  # pylint: disable=inconsistent-return-st
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/operations/_table_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/operations/_table_operations.py
index 10b995ac5311..cabeed39ae32 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/operations/_table_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/operations/_table_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._table_operations import (
     build_create_request,
     build_delete_request,
@@ -41,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]]
 
@@ -163,7 +160,7 @@ async def create(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.Table
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -201,7 +198,6 @@ async def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -215,7 +211,7 @@ async def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("Table", pipeline_response)
+        deserialized = self._deserialize("Table", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -319,7 +315,7 @@ async def update(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.Table
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -357,7 +353,6 @@ async def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -371,7 +366,7 @@ async def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("Table", pipeline_response)
+        deserialized = self._deserialize("Table", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -397,7 +392,7 @@ async def get(self, resource_group_name: str, account_name: str, table_name: str
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.Table
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -420,7 +415,6 @@ async def get(self, resource_group_name: str, account_name: str, table_name: str
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -434,7 +428,7 @@ async def get(self, resource_group_name: str, account_name: str, table_name: str
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("Table", pipeline_response)
+        deserialized = self._deserialize("Table", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -442,9 +436,7 @@ async def get(self, resource_group_name: str, account_name: str, table_name: str
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, table_name: str, **kwargs: Any
-    ) -> None:
+    async def delete(self, resource_group_name: str, account_name: str, table_name: str, **kwargs: Any) -> None:
         """Deletes the table with the specified table name, under the specified account if it exists.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -462,7 +454,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,
@@ -485,7 +477,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -523,7 +514,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> As
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-01-01"))
         cls: ClsType[_models.ListTableResource] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -542,7 +533,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -558,7 +548,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/operations/_table_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/operations/_table_services_operations.py
index e8562a94cca8..da334dce6027 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/operations/_table_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/operations/_table_services_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, Literal, Optional, Type, TypeVar, Union, overload
+from typing import Any, Callable, Dict, IO, Literal, Optional, TypeVar, Union, overload
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -19,14 +18,12 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._table_services_operations import (
     build_get_service_properties_request,
     build_list_request,
@@ -36,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]]
 
@@ -76,7 +73,7 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.ListTableServices
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -98,7 +95,6 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -112,7 +108,7 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListTableServices", pipeline_response)
+        deserialized = self._deserialize("ListTableServices", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -207,7 +203,7 @@ async def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.TableServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -243,7 +239,6 @@ async def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -257,7 +252,7 @@ async def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("TableServiceProperties", pipeline_response)
+        deserialized = self._deserialize("TableServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -282,7 +277,7 @@ async def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.TableServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -306,7 +301,6 @@ async def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -320,7 +314,7 @@ async def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("TableServiceProperties", pipeline_response)
+        deserialized = self._deserialize("TableServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/operations/_usages_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/operations/_usages_operations.py
index 5ccb6b03a3e0..fea5c1b31d11 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/operations/_usages_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/aio/operations/_usages_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
@@ -20,20 +19,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._usages_operations import build_list_by_location_request
 
 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 +72,7 @@ def list_by_location(self, location: str, **kwargs: Any) -> AsyncIterable["_mode
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-01-01"))
         cls: ClsType[_models.UsageListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -93,7 +90,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -109,7 +105,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/models/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/models/__init__.py
index ad7f16a1ac36..8a11c6e1dabc 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/models/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/models/__init__.py
@@ -5,232 +5,243 @@
 # 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 AccessPolicy
-from ._models_py3 import AccountImmutabilityPolicyProperties
-from ._models_py3 import AccountSasParameters
-from ._models_py3 import ActiveDirectoryProperties
-from ._models_py3 import AzureEntityResource
-from ._models_py3 import AzureFilesIdentityBasedAuthentication
-from ._models_py3 import BlobContainer
-from ._models_py3 import BlobInventoryCreationTime
-from ._models_py3 import BlobInventoryPolicy
-from ._models_py3 import BlobInventoryPolicyDefinition
-from ._models_py3 import BlobInventoryPolicyFilter
-from ._models_py3 import BlobInventoryPolicyRule
-from ._models_py3 import BlobInventoryPolicySchema
-from ._models_py3 import BlobRestoreParameters
-from ._models_py3 import BlobRestoreRange
-from ._models_py3 import BlobRestoreStatus
-from ._models_py3 import BlobServiceItems
-from ._models_py3 import BlobServiceProperties
-from ._models_py3 import ChangeFeed
-from ._models_py3 import CheckNameAvailabilityResult
-from ._models_py3 import CloudErrorBody
-from ._models_py3 import CorsRule
-from ._models_py3 import CorsRules
-from ._models_py3 import CustomDomain
-from ._models_py3 import DateAfterCreation
-from ._models_py3 import DateAfterModification
-from ._models_py3 import DeleteRetentionPolicy
-from ._models_py3 import DeletedAccount
-from ._models_py3 import DeletedAccountListResult
-from ._models_py3 import DeletedShare
-from ._models_py3 import Dimension
-from ._models_py3 import Encryption
-from ._models_py3 import EncryptionIdentity
-from ._models_py3 import EncryptionScope
-from ._models_py3 import EncryptionScopeKeyVaultProperties
-from ._models_py3 import EncryptionScopeListResult
-from ._models_py3 import EncryptionService
-from ._models_py3 import EncryptionServices
-from ._models_py3 import Endpoints
-from ._models_py3 import ErrorAdditionalInfo
-from ._models_py3 import ErrorDetail
-from ._models_py3 import ErrorResponse
-from ._models_py3 import ErrorResponseAutoGenerated
-from ._models_py3 import ErrorResponseBody
-from ._models_py3 import ExtendedLocation
-from ._models_py3 import FileServiceItems
-from ._models_py3 import FileServiceProperties
-from ._models_py3 import FileShare
-from ._models_py3 import FileShareItem
-from ._models_py3 import FileShareItems
-from ._models_py3 import GeoReplicationStats
-from ._models_py3 import IPRule
-from ._models_py3 import Identity
-from ._models_py3 import ImmutabilityPolicy
-from ._models_py3 import ImmutabilityPolicyProperties
-from ._models_py3 import ImmutableStorageAccount
-from ._models_py3 import ImmutableStorageWithVersioning
-from ._models_py3 import KeyCreationTime
-from ._models_py3 import KeyPolicy
-from ._models_py3 import KeyVaultProperties
-from ._models_py3 import LastAccessTimeTrackingPolicy
-from ._models_py3 import LeaseContainerRequest
-from ._models_py3 import LeaseContainerResponse
-from ._models_py3 import LeaseShareRequest
-from ._models_py3 import LeaseShareResponse
-from ._models_py3 import LegalHold
-from ._models_py3 import LegalHoldProperties
-from ._models_py3 import ListAccountSasResponse
-from ._models_py3 import ListBlobInventoryPolicy
-from ._models_py3 import ListContainerItem
-from ._models_py3 import ListContainerItems
-from ._models_py3 import ListQueue
-from ._models_py3 import ListQueueResource
-from ._models_py3 import ListQueueServices
-from ._models_py3 import ListServiceSasResponse
-from ._models_py3 import ListTableResource
-from ._models_py3 import ListTableServices
-from ._models_py3 import LocalUser
-from ._models_py3 import LocalUserKeys
-from ._models_py3 import LocalUserRegeneratePasswordResult
-from ._models_py3 import LocalUsers
-from ._models_py3 import ManagementPolicy
-from ._models_py3 import ManagementPolicyAction
-from ._models_py3 import ManagementPolicyBaseBlob
-from ._models_py3 import ManagementPolicyDefinition
-from ._models_py3 import ManagementPolicyFilter
-from ._models_py3 import ManagementPolicyRule
-from ._models_py3 import ManagementPolicySchema
-from ._models_py3 import ManagementPolicySnapShot
-from ._models_py3 import ManagementPolicyVersion
-from ._models_py3 import MetricSpecification
-from ._models_py3 import Multichannel
-from ._models_py3 import NetworkRuleSet
-from ._models_py3 import ObjectReplicationPolicies
-from ._models_py3 import ObjectReplicationPolicy
-from ._models_py3 import ObjectReplicationPolicyFilter
-from ._models_py3 import ObjectReplicationPolicyRule
-from ._models_py3 import Operation
-from ._models_py3 import OperationDisplay
-from ._models_py3 import OperationListResult
-from ._models_py3 import PermissionScope
-from ._models_py3 import PrivateEndpoint
-from ._models_py3 import PrivateEndpointConnection
-from ._models_py3 import PrivateEndpointConnectionListResult
-from ._models_py3 import PrivateLinkResource
-from ._models_py3 import PrivateLinkResourceListResult
-from ._models_py3 import PrivateLinkServiceConnectionState
-from ._models_py3 import ProtectedAppendWritesHistory
-from ._models_py3 import ProtocolSettings
-from ._models_py3 import ProxyResource
-from ._models_py3 import QueueServiceProperties
-from ._models_py3 import Resource
-from ._models_py3 import ResourceAccessRule
-from ._models_py3 import RestorePolicyProperties
-from ._models_py3 import Restriction
-from ._models_py3 import RoutingPreference
-from ._models_py3 import SKUCapability
-from ._models_py3 import SasPolicy
-from ._models_py3 import ServiceSasParameters
-from ._models_py3 import ServiceSpecification
-from ._models_py3 import SignedIdentifier
-from ._models_py3 import Sku
-from ._models_py3 import SkuInformation
-from ._models_py3 import SmbSetting
-from ._models_py3 import SshPublicKey
-from ._models_py3 import StorageAccount
-from ._models_py3 import StorageAccountCheckNameAvailabilityParameters
-from ._models_py3 import StorageAccountCreateParameters
-from ._models_py3 import StorageAccountInternetEndpoints
-from ._models_py3 import StorageAccountKey
-from ._models_py3 import StorageAccountListKeysResult
-from ._models_py3 import StorageAccountListResult
-from ._models_py3 import StorageAccountMicrosoftEndpoints
-from ._models_py3 import StorageAccountMigration
-from ._models_py3 import StorageAccountRegenerateKeyParameters
-from ._models_py3 import StorageAccountSkuConversionStatus
-from ._models_py3 import StorageAccountUpdateParameters
-from ._models_py3 import StorageQueue
-from ._models_py3 import StorageSkuListResult
-from ._models_py3 import SystemData
-from ._models_py3 import Table
-from ._models_py3 import TableAccessPolicy
-from ._models_py3 import TableServiceProperties
-from ._models_py3 import TableSignedIdentifier
-from ._models_py3 import TagFilter
-from ._models_py3 import TagProperty
-from ._models_py3 import TrackedResource
-from ._models_py3 import UpdateHistoryProperty
-from ._models_py3 import Usage
-from ._models_py3 import UsageListResult
-from ._models_py3 import UsageName
-from ._models_py3 import UserAssignedIdentity
-from ._models_py3 import VirtualNetworkRule
+from typing import TYPE_CHECKING
 
-from ._storage_management_client_enums import AccessTier
-from ._storage_management_client_enums import AccountImmutabilityPolicyState
-from ._storage_management_client_enums import AccountStatus
-from ._storage_management_client_enums import AccountType
-from ._storage_management_client_enums import AllowedCopyScope
-from ._storage_management_client_enums import AllowedMethods
-from ._storage_management_client_enums import BlobInventoryPolicyName
-from ._storage_management_client_enums import BlobRestoreProgressStatus
-from ._storage_management_client_enums import Bypass
-from ._storage_management_client_enums import CreatedByType
-from ._storage_management_client_enums import DefaultAction
-from ._storage_management_client_enums import DefaultSharePermission
-from ._storage_management_client_enums import DirectoryServiceOptions
-from ._storage_management_client_enums import DnsEndpointType
-from ._storage_management_client_enums import EnabledProtocols
-from ._storage_management_client_enums import EncryptionScopeSource
-from ._storage_management_client_enums import EncryptionScopeState
-from ._storage_management_client_enums import ExpirationAction
-from ._storage_management_client_enums import ExtendedLocationTypes
-from ._storage_management_client_enums import Format
-from ._storage_management_client_enums import GeoReplicationStatus
-from ._storage_management_client_enums import HttpProtocol
-from ._storage_management_client_enums import IdentityType
-from ._storage_management_client_enums import ImmutabilityPolicyState
-from ._storage_management_client_enums import ImmutabilityPolicyUpdateType
-from ._storage_management_client_enums import InventoryRuleType
-from ._storage_management_client_enums import KeyPermission
-from ._storage_management_client_enums import KeySource
-from ._storage_management_client_enums import KeyType
-from ._storage_management_client_enums import Kind
-from ._storage_management_client_enums import LargeFileSharesState
-from ._storage_management_client_enums import LeaseContainerRequestEnum
-from ._storage_management_client_enums import LeaseDuration
-from ._storage_management_client_enums import LeaseShareAction
-from ._storage_management_client_enums import LeaseState
-from ._storage_management_client_enums import LeaseStatus
-from ._storage_management_client_enums import ListContainersInclude
-from ._storage_management_client_enums import ListEncryptionScopesInclude
-from ._storage_management_client_enums import ManagementPolicyName
-from ._storage_management_client_enums import MigrationName
-from ._storage_management_client_enums import MigrationState
-from ._storage_management_client_enums import MigrationStatus
-from ._storage_management_client_enums import MinimumTlsVersion
-from ._storage_management_client_enums import Name
-from ._storage_management_client_enums import ObjectType
-from ._storage_management_client_enums import Permissions
-from ._storage_management_client_enums import PostFailoverRedundancy
-from ._storage_management_client_enums import PostPlannedFailoverRedundancy
-from ._storage_management_client_enums import PrivateEndpointConnectionProvisioningState
-from ._storage_management_client_enums import PrivateEndpointServiceConnectionStatus
-from ._storage_management_client_enums import ProvisioningState
-from ._storage_management_client_enums import PublicAccess
-from ._storage_management_client_enums import PublicNetworkAccess
-from ._storage_management_client_enums import Reason
-from ._storage_management_client_enums import ReasonCode
-from ._storage_management_client_enums import RootSquashType
-from ._storage_management_client_enums import RoutingChoice
-from ._storage_management_client_enums import RuleType
-from ._storage_management_client_enums import Schedule
-from ._storage_management_client_enums import Services
-from ._storage_management_client_enums import ShareAccessTier
-from ._storage_management_client_enums import SignedResource
-from ._storage_management_client_enums import SignedResourceTypes
-from ._storage_management_client_enums import SkuConversionStatus
-from ._storage_management_client_enums import SkuName
-from ._storage_management_client_enums import SkuTier
-from ._storage_management_client_enums import State
-from ._storage_management_client_enums import StorageAccountExpand
-from ._storage_management_client_enums import UsageUnit
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+
+from ._models_py3 import (  # type: ignore
+    AccessPolicy,
+    AccountImmutabilityPolicyProperties,
+    AccountSasParameters,
+    ActiveDirectoryProperties,
+    AzureEntityResource,
+    AzureFilesIdentityBasedAuthentication,
+    BlobContainer,
+    BlobInventoryCreationTime,
+    BlobInventoryPolicy,
+    BlobInventoryPolicyDefinition,
+    BlobInventoryPolicyFilter,
+    BlobInventoryPolicyRule,
+    BlobInventoryPolicySchema,
+    BlobRestoreParameters,
+    BlobRestoreRange,
+    BlobRestoreStatus,
+    BlobServiceItems,
+    BlobServiceProperties,
+    ChangeFeed,
+    CheckNameAvailabilityResult,
+    CloudErrorBody,
+    CorsRule,
+    CorsRules,
+    CustomDomain,
+    DateAfterCreation,
+    DateAfterModification,
+    DeleteRetentionPolicy,
+    DeletedAccount,
+    DeletedAccountListResult,
+    DeletedShare,
+    Dimension,
+    Encryption,
+    EncryptionIdentity,
+    EncryptionScope,
+    EncryptionScopeKeyVaultProperties,
+    EncryptionScopeListResult,
+    EncryptionService,
+    EncryptionServices,
+    Endpoints,
+    ErrorAdditionalInfo,
+    ErrorDetail,
+    ErrorResponse,
+    ErrorResponseAutoGenerated,
+    ErrorResponseBody,
+    ExtendedLocation,
+    FileServiceItems,
+    FileServiceProperties,
+    FileShare,
+    FileShareItem,
+    FileShareItems,
+    GeoReplicationStats,
+    IPRule,
+    Identity,
+    ImmutabilityPolicy,
+    ImmutabilityPolicyProperties,
+    ImmutableStorageAccount,
+    ImmutableStorageWithVersioning,
+    KeyCreationTime,
+    KeyPolicy,
+    KeyVaultProperties,
+    LastAccessTimeTrackingPolicy,
+    LeaseContainerRequest,
+    LeaseContainerResponse,
+    LeaseShareRequest,
+    LeaseShareResponse,
+    LegalHold,
+    LegalHoldProperties,
+    ListAccountSasResponse,
+    ListBlobInventoryPolicy,
+    ListContainerItem,
+    ListContainerItems,
+    ListQueue,
+    ListQueueResource,
+    ListQueueServices,
+    ListServiceSasResponse,
+    ListTableResource,
+    ListTableServices,
+    LocalUser,
+    LocalUserKeys,
+    LocalUserRegeneratePasswordResult,
+    LocalUsers,
+    ManagementPolicy,
+    ManagementPolicyAction,
+    ManagementPolicyBaseBlob,
+    ManagementPolicyDefinition,
+    ManagementPolicyFilter,
+    ManagementPolicyRule,
+    ManagementPolicySchema,
+    ManagementPolicySnapShot,
+    ManagementPolicyVersion,
+    MetricSpecification,
+    Multichannel,
+    NetworkRuleSet,
+    ObjectReplicationPolicies,
+    ObjectReplicationPolicy,
+    ObjectReplicationPolicyFilter,
+    ObjectReplicationPolicyRule,
+    Operation,
+    OperationDisplay,
+    OperationListResult,
+    PermissionScope,
+    PrivateEndpoint,
+    PrivateEndpointConnection,
+    PrivateEndpointConnectionListResult,
+    PrivateLinkResource,
+    PrivateLinkResourceListResult,
+    PrivateLinkServiceConnectionState,
+    ProtectedAppendWritesHistory,
+    ProtocolSettings,
+    ProxyResource,
+    QueueServiceProperties,
+    Resource,
+    ResourceAccessRule,
+    RestorePolicyProperties,
+    Restriction,
+    RoutingPreference,
+    SKUCapability,
+    SasPolicy,
+    ServiceSasParameters,
+    ServiceSpecification,
+    SignedIdentifier,
+    Sku,
+    SkuInformation,
+    SmbSetting,
+    SshPublicKey,
+    StorageAccount,
+    StorageAccountCheckNameAvailabilityParameters,
+    StorageAccountCreateParameters,
+    StorageAccountInternetEndpoints,
+    StorageAccountKey,
+    StorageAccountListKeysResult,
+    StorageAccountListResult,
+    StorageAccountMicrosoftEndpoints,
+    StorageAccountMigration,
+    StorageAccountRegenerateKeyParameters,
+    StorageAccountSkuConversionStatus,
+    StorageAccountUpdateParameters,
+    StorageQueue,
+    StorageSkuListResult,
+    SystemData,
+    Table,
+    TableAccessPolicy,
+    TableServiceProperties,
+    TableSignedIdentifier,
+    TagFilter,
+    TagProperty,
+    TrackedResource,
+    UpdateHistoryProperty,
+    Usage,
+    UsageListResult,
+    UsageName,
+    UserAssignedIdentity,
+    VirtualNetworkRule,
+)
+
+from ._storage_management_client_enums import (  # type: ignore
+    AccessTier,
+    AccountImmutabilityPolicyState,
+    AccountStatus,
+    AccountType,
+    AllowedCopyScope,
+    AllowedMethods,
+    BlobInventoryPolicyName,
+    BlobRestoreProgressStatus,
+    Bypass,
+    CreatedByType,
+    DefaultAction,
+    DefaultSharePermission,
+    DirectoryServiceOptions,
+    DnsEndpointType,
+    EnabledProtocols,
+    EncryptionScopeSource,
+    EncryptionScopeState,
+    ExpirationAction,
+    ExtendedLocationTypes,
+    Format,
+    GeoReplicationStatus,
+    HttpProtocol,
+    IdentityType,
+    ImmutabilityPolicyState,
+    ImmutabilityPolicyUpdateType,
+    InventoryRuleType,
+    KeyPermission,
+    KeySource,
+    KeyType,
+    Kind,
+    LargeFileSharesState,
+    LeaseContainerRequestEnum,
+    LeaseDuration,
+    LeaseShareAction,
+    LeaseState,
+    LeaseStatus,
+    ListContainersInclude,
+    ListEncryptionScopesInclude,
+    ManagementPolicyName,
+    MigrationName,
+    MigrationState,
+    MigrationStatus,
+    MinimumTlsVersion,
+    Name,
+    ObjectType,
+    Permissions,
+    PostFailoverRedundancy,
+    PostPlannedFailoverRedundancy,
+    PrivateEndpointConnectionProvisioningState,
+    PrivateEndpointServiceConnectionStatus,
+    ProvisioningState,
+    PublicAccess,
+    PublicNetworkAccess,
+    Reason,
+    ReasonCode,
+    RootSquashType,
+    RoutingChoice,
+    RuleType,
+    Schedule,
+    Services,
+    ShareAccessTier,
+    SignedResource,
+    SignedResourceTypes,
+    SkuConversionStatus,
+    SkuName,
+    SkuTier,
+    State,
+    StorageAccountExpand,
+    UsageUnit,
+)
 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__ = [
@@ -457,5 +468,5 @@
     "StorageAccountExpand",
     "UsageUnit",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/models/_models_py3.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/models/_models_py3.py
index 64f527dc3fd2..baa970acbf1f 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/models/_models_py3.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/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
 
 
@@ -440,7 +439,7 @@ def __init__(
         self.default_share_permission = default_share_permission
 
 
-class BlobContainer(AzureEntityResource):  # pylint: disable=too-many-instance-attributes
+class BlobContainer(AzureEntityResource):
     """Properties of the blob container, including Id, resource name, resource type, Etag.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -1142,7 +1141,7 @@ def __init__(self, **kwargs: Any) -> None:
         self.value = None
 
 
-class BlobServiceProperties(Resource):  # pylint: disable=too-many-instance-attributes
+class BlobServiceProperties(Resource):
     """The properties of a storage account’s Blob service.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -2547,7 +2546,7 @@ def __init__(
         self.protocol_settings = protocol_settings
 
 
-class FileShare(AzureEntityResource):  # pylint: disable=too-many-instance-attributes
+class FileShare(AzureEntityResource):
     """Properties of the file share, including Id, resource name, resource type, Etag.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -2705,7 +2704,7 @@ def __init__(
         self.snapshot_time = None
 
 
-class FileShareItem(AzureEntityResource):  # pylint: disable=too-many-instance-attributes
+class FileShareItem(AzureEntityResource):
     """The file share properties be listed out.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -3490,7 +3489,7 @@ class LeaseContainerRequest(_serialization.Model):
     All required parameters must be populated in order to send to server.
 
     :ivar action: Specifies the lease action. Can be one of the available actions. Required. Known
-     values are: "Acquire", "Renew", "Change", "Release", and "Break".
+     values are: "Acquire", "Renew", "Change", "Release", "Break", and "Break".
     :vartype action: str or ~azure.mgmt.storage.v2023_01_01.models.LeaseContainerRequestEnum
     :ivar lease_id: Identifies the lease. Can be specified in any valid GUID string format.
     :vartype lease_id: str
@@ -3529,7 +3528,7 @@ def __init__(
     ) -> None:
         """
         :keyword action: Specifies the lease action. Can be one of the available actions. Required.
-         Known values are: "Acquire", "Renew", "Change", "Release", and "Break".
+         Known values are: "Acquire", "Renew", "Change", "Release", "Break", and "Break".
         :paramtype action: str or ~azure.mgmt.storage.v2023_01_01.models.LeaseContainerRequestEnum
         :keyword lease_id: Identifies the lease. Can be specified in any valid GUID string format.
         :paramtype lease_id: str
@@ -3587,7 +3586,7 @@ class LeaseShareRequest(_serialization.Model):
     All required parameters must be populated in order to send to server.
 
     :ivar action: Specifies the lease action. Can be one of the available actions. Required. Known
-     values are: "Acquire", "Renew", "Change", "Release", and "Break".
+     values are: "Acquire", "Renew", "Change", "Release", "Break", and "Break".
     :vartype action: str or ~azure.mgmt.storage.v2023_01_01.models.LeaseShareAction
     :ivar lease_id: Identifies the lease. Can be specified in any valid GUID string format.
     :vartype lease_id: str
@@ -3626,7 +3625,7 @@ def __init__(
     ) -> None:
         """
         :keyword action: Specifies the lease action. Can be one of the available actions. Required.
-         Known values are: "Acquire", "Renew", "Change", "Release", and "Break".
+         Known values are: "Acquire", "Renew", "Change", "Release", "Break", and "Break".
         :paramtype action: str or ~azure.mgmt.storage.v2023_01_01.models.LeaseShareAction
         :keyword lease_id: Identifies the lease. Can be specified in any valid GUID string format.
         :paramtype lease_id: str
@@ -3824,7 +3823,7 @@ def __init__(self, **kwargs: Any) -> None:
         self.value = None
 
 
-class ListContainerItem(AzureEntityResource):  # pylint: disable=too-many-instance-attributes
+class ListContainerItem(AzureEntityResource):
     """The blob container properties be listed out.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -4192,7 +4191,7 @@ def __init__(self, **kwargs: Any) -> None:
         self.value = None
 
 
-class LocalUser(Resource):  # pylint: disable=too-many-instance-attributes
+class LocalUser(Resource):
     """The local user associated with the storage accounts.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -5826,7 +5825,7 @@ def __init__(
         self.expiration_action = expiration_action
 
 
-class ServiceSasParameters(_serialization.Model):  # pylint: disable=too-many-instance-attributes
+class ServiceSasParameters(_serialization.Model):
     """The parameters to list service SAS credentials of a specific resource.
 
     All required parameters must be populated in order to send to server.
@@ -6260,7 +6259,7 @@ class SshPublicKey(_serialization.Model):
 
     :ivar description: Optional. It is used to store the function/usage of the key.
     :vartype description: str
-    :ivar key: Ssh public key base64 encoded. The format should be: ':code:`<keyType>`
+    :ivar key: Ssh public key base64 encoded. The format should be: '\\ :code:`<keyType>`
      :code:`<keyData>`', e.g. ssh-rsa AAAABBBB.
     :vartype key: str
     """
@@ -6274,7 +6273,7 @@ def __init__(self, *, description: Optional[str] = None, key: Optional[str] = No
         """
         :keyword description: Optional. It is used to store the function/usage of the key.
         :paramtype description: str
-        :keyword key: Ssh public key base64 encoded. The format should be: ':code:`<keyType>`
+        :keyword key: Ssh public key base64 encoded. The format should be: '\\ :code:`<keyType>`
          :code:`<keyData>`', e.g. ssh-rsa AAAABBBB.
         :paramtype key: str
         """
@@ -6332,7 +6331,7 @@ def __init__(self, *, location: str, tags: Optional[Dict[str, str]] = None, **kw
         self.location = location
 
 
-class StorageAccount(TrackedResource):  # pylint: disable=too-many-instance-attributes
+class StorageAccount(TrackedResource):
     """The storage account.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -6768,7 +6767,7 @@ def __init__(self, *, name: str, **kwargs: Any) -> None:
         self.name = name
 
 
-class StorageAccountCreateParameters(_serialization.Model):  # pylint: disable=too-many-instance-attributes
+class StorageAccountCreateParameters(_serialization.Model):
     """The parameters used when creating a storage account.
 
     All required parameters must be populated in order to send to server.
@@ -7414,7 +7413,7 @@ def __init__(self, *, target_sku_name: Optional[Union[str, "_models.SkuName"]] =
         self.end_time = None
 
 
-class StorageAccountUpdateParameters(_serialization.Model):  # pylint: disable=too-many-instance-attributes
+class StorageAccountUpdateParameters(_serialization.Model):
     """The parameters that can be provided when updating the storage account properties.
 
     :ivar sku: Gets or sets the SKU name. Note that the SKU name cannot be updated to Standard_ZRS,
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/models/_storage_management_client_enums.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/models/_storage_management_client_enums.py
index f6a4eb0a48b0..261ed4a5072e 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/models/_storage_management_client_enums.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/models/_storage_management_client_enums.py
@@ -294,6 +294,7 @@ class LeaseContainerRequestEnum(str, Enum, metaclass=CaseInsensitiveEnumMeta):
     RENEW = "Renew"
     CHANGE = "Change"
     RELEASE = "Release"
+    BREAK = "Break"
     BREAK_ENUM = "Break"
 
 
@@ -313,6 +314,7 @@ class LeaseShareAction(str, Enum, metaclass=CaseInsensitiveEnumMeta):
     RENEW = "Renew"
     CHANGE = "Change"
     RELEASE = "Release"
+    BREAK = "Break"
     BREAK_ENUM = "Break"
 
 
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/operations/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/operations/__init__.py
index bbce85749d18..a0549517e087 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/operations/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/operations/__init__.py
@@ -5,30 +5,36 @@
 # 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 ._skus_operations import SkusOperations
-from ._storage_accounts_operations import StorageAccountsOperations
-from ._deleted_accounts_operations import DeletedAccountsOperations
-from ._usages_operations import UsagesOperations
-from ._management_policies_operations import ManagementPoliciesOperations
-from ._blob_inventory_policies_operations import BlobInventoryPoliciesOperations
-from ._private_endpoint_connections_operations import PrivateEndpointConnectionsOperations
-from ._private_link_resources_operations import PrivateLinkResourcesOperations
-from ._object_replication_policies_operations import ObjectReplicationPoliciesOperations
-from ._local_users_operations import LocalUsersOperations
-from ._encryption_scopes_operations import EncryptionScopesOperations
-from ._blob_services_operations import BlobServicesOperations
-from ._blob_containers_operations import BlobContainersOperations
-from ._file_services_operations import FileServicesOperations
-from ._file_shares_operations import FileSharesOperations
-from ._queue_services_operations import QueueServicesOperations
-from ._queue_operations import QueueOperations
-from ._table_services_operations import TableServicesOperations
-from ._table_operations import TableOperations
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._operations import Operations  # type: ignore
+from ._skus_operations import SkusOperations  # type: ignore
+from ._storage_accounts_operations import StorageAccountsOperations  # type: ignore
+from ._deleted_accounts_operations import DeletedAccountsOperations  # type: ignore
+from ._usages_operations import UsagesOperations  # type: ignore
+from ._management_policies_operations import ManagementPoliciesOperations  # type: ignore
+from ._blob_inventory_policies_operations import BlobInventoryPoliciesOperations  # type: ignore
+from ._private_endpoint_connections_operations import PrivateEndpointConnectionsOperations  # type: ignore
+from ._private_link_resources_operations import PrivateLinkResourcesOperations  # type: ignore
+from ._object_replication_policies_operations import ObjectReplicationPoliciesOperations  # type: ignore
+from ._local_users_operations import LocalUsersOperations  # type: ignore
+from ._encryption_scopes_operations import EncryptionScopesOperations  # type: ignore
+from ._blob_services_operations import BlobServicesOperations  # type: ignore
+from ._blob_containers_operations import BlobContainersOperations  # type: ignore
+from ._file_services_operations import FileServicesOperations  # type: ignore
+from ._file_shares_operations import FileSharesOperations  # type: ignore
+from ._queue_services_operations import QueueServicesOperations  # type: ignore
+from ._queue_operations import QueueOperations  # type: ignore
+from ._table_services_operations import TableServicesOperations  # type: ignore
+from ._table_operations import TableOperations  # 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__ = [
@@ -53,5 +59,5 @@
     "TableServicesOperations",
     "TableOperations",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/operations/_blob_containers_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/operations/_blob_containers_operations.py
index a71a4a713f0a..095948660e08 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/operations/_blob_containers_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/operations/_blob_containers_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,7 @@
 # --------------------------------------------------------------------------
 from io import IOBase
 import sys
-from typing import Any, Callable, Dict, IO, Iterable, Literal, Optional, Type, TypeVar, Union, cast, overload
+from typing import Any, Callable, Dict, IO, Iterable, Iterator, Literal, Optional, TypeVar, Union, cast, overload
 import urllib.parse
 
 from azure.core.exceptions import (
@@ -17,13 +17,14 @@
     ResourceExistsError,
     ResourceNotFoundError,
     ResourceNotModifiedError,
+    StreamClosedError,
+    StreamConsumedError,
     map_error,
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
 from azure.core.polling import LROPoller, NoPolling, PollingMethod
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
@@ -31,12 +32,11 @@
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -677,7 +677,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-01-01"))
         cls: ClsType[_models.ListContainerItems] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -699,7 +699,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -715,7 +714,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -850,7 +848,7 @@ def create(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -885,7 +883,6 @@ def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -899,11 +896,7 @@ def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("BlobContainer", pipeline_response)
-
-        if response.status_code == 201:
-            deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1013,7 +1006,7 @@ def update(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1048,7 +1041,6 @@ def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1062,7 +1054,7 @@ def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1091,7 +1083,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1114,7 +1106,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1128,7 +1119,7 @@ def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1157,7 +1148,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,
@@ -1180,7 +1171,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1303,7 +1293,7 @@ def set_legal_hold(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.LegalHold
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1338,7 +1328,6 @@ def set_legal_hold(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1352,7 +1341,7 @@ def set_legal_hold(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LegalHold", pipeline_response)
+        deserialized = self._deserialize("LegalHold", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1462,7 +1451,7 @@ def clear_legal_hold(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.LegalHold
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1497,7 +1486,6 @@ def clear_legal_hold(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1511,7 +1499,7 @@ def clear_legal_hold(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LegalHold", pipeline_response)
+        deserialized = self._deserialize("LegalHold", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1638,7 +1626,7 @@ def create_or_update_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1679,7 +1667,6 @@ def create_or_update_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1696,7 +1683,7 @@ def create_or_update_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1735,7 +1722,7 @@ def get_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1761,7 +1748,6 @@ def get_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1778,7 +1764,7 @@ def get_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1814,7 +1800,7 @@ def delete_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1840,7 +1826,6 @@ def delete_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1857,7 +1842,7 @@ def delete_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1891,7 +1876,7 @@ def lock_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1915,7 +1900,6 @@ def lock_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1932,7 +1916,7 @@ def lock_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -2062,7 +2046,7 @@ def extend_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -2101,7 +2085,6 @@ def extend_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -2118,7 +2101,7 @@ def extend_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -2228,7 +2211,7 @@ def lease(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.LeaseContainerResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -2266,7 +2249,6 @@ def lease(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -2280,17 +2262,17 @@ def lease(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LeaseContainerResponse", pipeline_response)
+        deserialized = self._deserialize("LeaseContainerResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
 
         return deserialized  # type: ignore
 
-    def _object_level_worm_initial(  # pylint: disable=inconsistent-return-statements
+    def _object_level_worm_initial(
         self, resource_group_name: str, account_name: str, container_name: str, **kwargs: Any
-    ) -> None:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> Iterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -2302,7 +2284,7 @@ def _object_level_worm_initial(  # pylint: disable=inconsistent-return-statement
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-01-01"))
-        cls: ClsType[None] = kwargs.pop("cls", None)
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
 
         _request = build_object_level_worm_request(
             resource_group_name=resource_group_name,
@@ -2313,10 +2295,10 @@ def _object_level_worm_initial(  # pylint: disable=inconsistent-return-statement
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -2324,11 +2306,19 @@ def _object_level_worm_initial(  # pylint: disable=inconsistent-return-statement
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
-            return cls(pipeline_response, None, {})  # type: ignore
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
 
     @distributed_trace
     def begin_object_level_worm(
@@ -2364,7 +2354,7 @@ def begin_object_level_worm(
         lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
         cont_token: Optional[str] = kwargs.pop("continuation_token", None)
         if cont_token is None:
-            raw_result = self._object_level_worm_initial(  # type: ignore
+            raw_result = self._object_level_worm_initial(
                 resource_group_name=resource_group_name,
                 account_name=account_name,
                 container_name=container_name,
@@ -2374,6 +2364,7 @@ def begin_object_level_worm(
                 params=_params,
                 **kwargs
             )
+            raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/operations/_blob_inventory_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/operations/_blob_inventory_policies_operations.py
index 519d1b591c98..2bb75ec5ae22 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/operations/_blob_inventory_policies_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/operations/_blob_inventory_policies_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 (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -243,7 +240,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.BlobInventoryPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -266,7 +263,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -280,7 +276,7 @@ def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response)
+        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -384,7 +380,7 @@ def create_or_update(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.BlobInventoryPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -419,7 +415,6 @@ def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -433,7 +428,7 @@ def create_or_update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response)
+        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -465,7 +460,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,
@@ -488,7 +483,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -529,7 +523,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-01-01"))
         cls: ClsType[_models.ListBlobInventoryPolicy] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -548,7 +542,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -564,7 +557,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/operations/_blob_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/operations/_blob_services_operations.py
index 22790f8c0773..a566d61195e4 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/operations/_blob_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/operations/_blob_services_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, Literal, Optional, Type, TypeVar, Union, overload
+from typing import Any, Callable, Dict, IO, Iterable, Literal, Optional, TypeVar, Union, overload
 import urllib.parse
 
 from azure.core.exceptions import (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -197,7 +194,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-01-01"))
         cls: ClsType[_models.BlobServiceItems] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -216,7 +213,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -232,7 +228,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -349,7 +344,7 @@ def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.BlobServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -385,7 +380,6 @@ def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -399,7 +393,7 @@ def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobServiceProperties", pipeline_response)
+        deserialized = self._deserialize("BlobServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -424,7 +418,7 @@ def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.BlobServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -448,7 +442,6 @@ def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -462,7 +455,7 @@ def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobServiceProperties", pipeline_response)
+        deserialized = self._deserialize("BlobServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/operations/_deleted_accounts_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/operations/_deleted_accounts_operations.py
index b1309c8fb713..abdd468f9d01 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/operations/_deleted_accounts_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/operations/_deleted_accounts_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 (
@@ -20,20 +19,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -130,7 +127,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.DeletedAccount"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-01-01"))
         cls: ClsType[_models.DeletedAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -147,7 +144,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -163,7 +159,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -205,7 +200,7 @@ def get(self, deleted_account_name: str, location: str, **kwargs: Any) -> _model
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.DeletedAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -227,7 +222,6 @@ def get(self, deleted_account_name: str, location: str, **kwargs: Any) -> _model
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -242,7 +236,7 @@ def get(self, deleted_account_name: str, location: str, **kwargs: Any) -> _model
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("DeletedAccount", pipeline_response)
+        deserialized = self._deserialize("DeletedAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/operations/_encryption_scopes_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/operations/_encryption_scopes_operations.py
index 9aab933c2612..a74904e6addc 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/operations/_encryption_scopes_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/operations/_encryption_scopes_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 (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -338,7 +335,7 @@ def put(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.EncryptionScope
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -373,7 +370,6 @@ def put(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -388,11 +384,7 @@ def put(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("EncryptionScope", pipeline_response)
-
-        if response.status_code == 201:
-            deserialized = self._deserialize("EncryptionScope", pipeline_response)
+        deserialized = self._deserialize("EncryptionScope", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -502,7 +494,7 @@ def patch(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.EncryptionScope
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -537,7 +529,6 @@ def patch(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -552,7 +543,7 @@ def patch(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("EncryptionScope", pipeline_response)
+        deserialized = self._deserialize("EncryptionScope", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -581,7 +572,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.EncryptionScope
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -604,7 +595,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -619,7 +609,7 @@ def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("EncryptionScope", pipeline_response)
+        deserialized = self._deserialize("EncryptionScope", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -664,7 +654,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-01-01"))
         cls: ClsType[_models.EncryptionScopeListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -686,7 +676,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -702,7 +691,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/operations/_file_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/operations/_file_services_operations.py
index 3dd19e0f6ba9..378098613519 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/operations/_file_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/operations/_file_services_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, Literal, Optional, Type, TypeVar, Union, overload
+from typing import Any, Callable, Dict, IO, Literal, Optional, TypeVar, Union, overload
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -19,20 +18,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -185,7 +182,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.FileServiceItems
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -207,7 +204,6 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -221,7 +217,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileServiceItems", pipeline_response)
+        deserialized = self._deserialize("FileServiceItems", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -316,7 +312,7 @@ def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.FileServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -352,7 +348,6 @@ def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -366,7 +361,7 @@ def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileServiceProperties", pipeline_response)
+        deserialized = self._deserialize("FileServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -391,7 +386,7 @@ def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.FileServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -415,7 +410,6 @@ def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -429,7 +423,7 @@ def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileServiceProperties", pipeline_response)
+        deserialized = self._deserialize("FileServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/operations/_file_shares_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/operations/_file_shares_operations.py
index 193b91228cd6..2ee222f907b3 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/operations/_file_shares_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/operations/_file_shares_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,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 (
@@ -21,20 +21,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -415,7 +413,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-01-01"))
         cls: ClsType[_models.FileShareItems] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -437,7 +435,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -453,7 +450,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -600,7 +596,7 @@ def create(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.FileShare
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -636,7 +632,6 @@ def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -650,11 +645,7 @@ def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("FileShare", pipeline_response)
-
-        if response.status_code == 201:
-            deserialized = self._deserialize("FileShare", pipeline_response)
+        deserialized = self._deserialize("FileShare", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -764,7 +755,7 @@ def update(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.FileShare
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -799,7 +790,6 @@ def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -813,7 +803,7 @@ def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileShare", pipeline_response)
+        deserialized = self._deserialize("FileShare", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -854,7 +844,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.FileShare
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -879,7 +869,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -893,7 +882,7 @@ def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileShare", pipeline_response)
+        deserialized = self._deserialize("FileShare", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -938,7 +927,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,
@@ -963,7 +952,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -981,7 +969,7 @@ def delete(  # pylint: disable=inconsistent-return-statements
             return cls(pipeline_response, None, {})  # type: ignore
 
     @overload
-    def restore(  # pylint: disable=inconsistent-return-statements
+    def restore(
         self,
         resource_group_name: str,
         account_name: str,
@@ -1016,7 +1004,7 @@ def restore(  # pylint: disable=inconsistent-return-statements
         """
 
     @overload
-    def restore(  # pylint: disable=inconsistent-return-statements
+    def restore(
         self,
         resource_group_name: str,
         account_name: str,
@@ -1079,7 +1067,7 @@ def restore(  # 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,
@@ -1114,7 +1102,6 @@ def restore(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1246,7 +1233,7 @@ def lease(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.LeaseShareResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1285,7 +1272,6 @@ def lease(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1302,7 +1288,7 @@ def lease(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("LeaseShareResponse", pipeline_response)
+        deserialized = self._deserialize("LeaseShareResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/operations/_local_users_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/operations/_local_users_operations.py
index 3f554e0ed8c7..2edbb539c06a 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/operations/_local_users_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/operations/_local_users_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 (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -299,7 +296,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> It
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-01-01"))
         cls: ClsType[_models.LocalUsers] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -318,7 +315,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -334,7 +330,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -382,7 +377,7 @@ def get(self, resource_group_name: str, account_name: str, username: str, **kwar
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.LocalUser
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -405,7 +400,6 @@ def get(self, resource_group_name: str, account_name: str, username: str, **kwar
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -420,7 +414,7 @@ def get(self, resource_group_name: str, account_name: str, username: str, **kwar
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LocalUser", pipeline_response)
+        deserialized = self._deserialize("LocalUser", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -521,7 +515,7 @@ def create_or_update(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.LocalUser
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -556,7 +550,6 @@ def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -571,7 +564,7 @@ def create_or_update(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LocalUser", pipeline_response)
+        deserialized = self._deserialize("LocalUser", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -598,7 +591,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,
@@ -621,7 +614,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -659,7 +651,7 @@ def list_keys(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.LocalUserKeys
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -682,7 +674,6 @@ def list_keys(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -697,7 +688,7 @@ def list_keys(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LocalUserKeys", pipeline_response)
+        deserialized = self._deserialize("LocalUserKeys", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -724,7 +715,7 @@ def regenerate_password(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.LocalUserRegeneratePasswordResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -747,7 +738,6 @@ def regenerate_password(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -762,7 +752,7 @@ def regenerate_password(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LocalUserRegeneratePasswordResult", pipeline_response)
+        deserialized = self._deserialize("LocalUserRegeneratePasswordResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/operations/_management_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/operations/_management_policies_operations.py
index 5eccc48f072f..54b62a627ef5 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/operations/_management_policies_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/operations/_management_policies_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,
@@ -19,20 +18,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -202,7 +199,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.ManagementPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -225,7 +222,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -239,7 +235,7 @@ def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ManagementPolicy", pipeline_response)
+        deserialized = self._deserialize("ManagementPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -343,7 +339,7 @@ def create_or_update(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.ManagementPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -378,7 +374,6 @@ def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -392,7 +387,7 @@ def create_or_update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ManagementPolicy", pipeline_response)
+        deserialized = self._deserialize("ManagementPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -424,7 +419,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,
@@ -447,7 +442,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/operations/_object_replication_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/operations/_object_replication_policies_operations.py
index 6c8c4f746509..b14e81403910 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/operations/_object_replication_policies_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/operations/_object_replication_policies_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 (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -237,7 +234,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-01-01"))
         cls: ClsType[_models.ObjectReplicationPolicies] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -256,7 +253,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -272,7 +268,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -324,7 +319,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.ObjectReplicationPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -347,7 +342,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -362,7 +356,7 @@ def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response)
+        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -472,7 +466,7 @@ def create_or_update(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.ObjectReplicationPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -507,7 +501,6 @@ def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -522,7 +515,7 @@ def create_or_update(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response)
+        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -551,7 +544,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,
@@ -574,7 +567,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/operations/_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/operations/_operations.py
index 56dbe6bf4e1f..df181a9e7964 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/operations/_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/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 (
@@ -20,20 +19,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -94,7 +91,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.Operation"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-01-01"))
         cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -110,7 +107,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -126,7 +122,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/operations/_private_endpoint_connections_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/operations/_private_endpoint_connections_operations.py
index ca36fdcccb86..4b520442628c 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/operations/_private_endpoint_connections_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/operations/_private_endpoint_connections_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 (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -249,7 +246,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-01-01"))
         cls: ClsType[_models.PrivateEndpointConnectionListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -268,7 +265,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -284,7 +280,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -333,7 +328,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.PrivateEndpointConnection
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -356,7 +351,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -371,7 +365,7 @@ def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response)
+        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -472,7 +466,7 @@ def put(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.PrivateEndpointConnection
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -507,7 +501,6 @@ def put(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -522,7 +515,7 @@ def put(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response)
+        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -549,7 +542,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,
@@ -572,7 +565,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/operations/_private_link_resources_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/operations/_private_link_resources_operations.py
index e0aba5583ba6..42a10efbff74 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/operations/_private_link_resources_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/operations/_private_link_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, Optional, Type, TypeVar
+from typing import Any, Callable, Dict, Optional, TypeVar
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -18,20 +17,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -111,7 +108,7 @@ def list_by_storage_account(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.PrivateLinkResourceListResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -133,7 +130,6 @@ def list_by_storage_account(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -147,7 +143,7 @@ def list_by_storage_account(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("PrivateLinkResourceListResult", pipeline_response)
+        deserialized = self._deserialize("PrivateLinkResourceListResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/operations/_queue_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/operations/_queue_operations.py
index 2720242f48e5..d0ed54dcf210 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/operations/_queue_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/operations/_queue_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 (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -385,7 +382,7 @@ def create(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.StorageQueue
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -420,7 +417,6 @@ def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -434,7 +430,7 @@ def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageQueue", pipeline_response)
+        deserialized = self._deserialize("StorageQueue", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -541,7 +537,7 @@ def update(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.StorageQueue
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -576,7 +572,6 @@ def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -590,7 +585,7 @@ def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageQueue", pipeline_response)
+        deserialized = self._deserialize("StorageQueue", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -617,7 +612,7 @@ def get(self, resource_group_name: str, account_name: str, queue_name: str, **kw
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.StorageQueue
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -640,7 +635,6 @@ def get(self, resource_group_name: str, account_name: str, queue_name: str, **kw
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -654,7 +648,7 @@ def get(self, resource_group_name: str, account_name: str, queue_name: str, **kw
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageQueue", pipeline_response)
+        deserialized = self._deserialize("StorageQueue", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -683,7 +677,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,
@@ -706,7 +700,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -757,7 +750,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-01-01"))
         cls: ClsType[_models.ListQueueResource] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -778,7 +771,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -794,7 +786,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/operations/_queue_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/operations/_queue_services_operations.py
index 323c25562021..1f1f9285af5a 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/operations/_queue_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/operations/_queue_services_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, Literal, Optional, Type, TypeVar, Union, overload
+from typing import Any, Callable, Dict, IO, Literal, Optional, TypeVar, Union, overload
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -19,20 +18,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -185,7 +182,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.ListQueueServices
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -207,7 +204,6 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -221,7 +217,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListQueueServices", pipeline_response)
+        deserialized = self._deserialize("ListQueueServices", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -316,7 +312,7 @@ def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.QueueServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -352,7 +348,6 @@ def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -366,7 +361,7 @@ def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("QueueServiceProperties", pipeline_response)
+        deserialized = self._deserialize("QueueServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -391,7 +386,7 @@ def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.QueueServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -415,7 +410,6 @@ def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -429,7 +423,7 @@ def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("QueueServiceProperties", pipeline_response)
+        deserialized = self._deserialize("QueueServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/operations/_skus_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/operations/_skus_operations.py
index 1c096f272047..fe2b50ffa308 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/operations/_skus_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/operations/_skus_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 (
@@ -20,20 +19,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -99,7 +96,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.SkuInformation"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-01-01"))
         cls: ClsType[_models.StorageSkuListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -116,7 +113,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -132,7 +128,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/operations/_storage_accounts_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/operations/_storage_accounts_operations.py
index 3a5b128f947b..9e0aa9c99c2d 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/operations/_storage_accounts_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/operations/_storage_accounts_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,7 @@
 # --------------------------------------------------------------------------
 from io import IOBase
 import sys
-from typing import Any, Callable, Dict, IO, Iterable, Literal, Optional, Type, TypeVar, Union, cast, overload
+from typing import Any, Callable, Dict, IO, Iterable, Iterator, Literal, Optional, TypeVar, Union, cast, overload
 import urllib.parse
 
 from azure.core.exceptions import (
@@ -17,13 +17,14 @@
     ResourceExistsError,
     ResourceNotFoundError,
     ResourceNotModifiedError,
+    StreamClosedError,
+    StreamConsumedError,
     map_error,
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
 from azure.core.polling import LROPoller, NoPolling, PollingMethod
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
@@ -31,12 +32,11 @@
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -758,7 +758,7 @@ def check_name_availability(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.CheckNameAvailabilityResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -790,7 +790,6 @@ def check_name_availability(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -804,7 +803,7 @@ def check_name_availability(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response)
+        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -817,8 +816,8 @@ def _create_initial(
         account_name: str,
         parameters: Union[_models.StorageAccountCreateParameters, IO[bytes]],
         **kwargs: Any
-    ) -> Optional[_models.StorageAccount]:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> Iterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -831,7 +830,7 @@ def _create_initial(
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-01-01"))
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
-        cls: ClsType[Optional[_models.StorageAccount]] = kwargs.pop("cls", None)
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
         _json = None
@@ -852,10 +851,10 @@ def _create_initial(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -863,12 +862,14 @@ def _create_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = None
-        if response.status_code == 200:
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -991,10 +992,11 @@ def begin_create(
                 params=_params,
                 **kwargs
             )
+            raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+            deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
             if cls:
                 return cls(pipeline_response, deserialized, {})  # type: ignore
             return deserialized
@@ -1033,7 +1035,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,
@@ -1055,7 +1057,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1100,7 +1101,7 @@ def get_properties(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1123,7 +1124,6 @@ def get_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1137,7 +1137,7 @@ def get_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1248,7 +1248,7 @@ def update(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1282,7 +1282,6 @@ def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1296,7 +1295,7 @@ def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1318,7 +1317,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.StorageAccount"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-01-01"))
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1335,7 +1334,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -1351,7 +1349,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -1398,7 +1395,7 @@ def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> Ite
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-01-01"))
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1416,7 +1413,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -1432,7 +1428,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -1482,7 +1477,7 @@ def list_keys(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.StorageAccountListKeysResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1505,7 +1500,6 @@ def list_keys(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1519,7 +1513,7 @@ def list_keys(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response)
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1613,7 +1607,7 @@ def regenerate_key(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.StorageAccountListKeysResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1647,7 +1641,6 @@ def regenerate_key(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1661,7 +1654,7 @@ def regenerate_key(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response)
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1752,7 +1745,7 @@ def list_account_sas(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.ListAccountSasResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1786,7 +1779,6 @@ def list_account_sas(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1800,7 +1792,7 @@ def list_account_sas(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListAccountSasResponse", pipeline_response)
+        deserialized = self._deserialize("ListAccountSasResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1889,7 +1881,7 @@ def list_service_sas(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.ListServiceSasResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1923,7 +1915,6 @@ def list_service_sas(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1937,17 +1928,17 @@ def list_service_sas(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListServiceSasResponse", pipeline_response)
+        deserialized = self._deserialize("ListServiceSasResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
 
         return deserialized  # type: ignore
 
-    def _failover_initial(  # pylint: disable=inconsistent-return-statements
+    def _failover_initial(
         self, resource_group_name: str, account_name: str, failover_type: Literal["Planned"] = "Planned", **kwargs: Any
-    ) -> None:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> Iterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1959,7 +1950,7 @@ def _failover_initial(  # pylint: disable=inconsistent-return-statements
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-01-01"))
-        cls: ClsType[None] = kwargs.pop("cls", None)
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
 
         _request = build_failover_request(
             resource_group_name=resource_group_name,
@@ -1970,10 +1961,10 @@ def _failover_initial(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -1981,11 +1972,19 @@ def _failover_initial(  # pylint: disable=inconsistent-return-statements
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
-            return cls(pipeline_response, None, {})  # type: ignore
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
 
     @distributed_trace
     def begin_failover(
@@ -2026,7 +2025,7 @@ def begin_failover(
         lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
         cont_token: Optional[str] = kwargs.pop("continuation_token", None)
         if cont_token is None:
-            raw_result = self._failover_initial(  # type: ignore
+            raw_result = self._failover_initial(
                 resource_group_name=resource_group_name,
                 account_name=account_name,
                 failover_type=failover_type,
@@ -2036,6 +2035,7 @@ def begin_failover(
                 params=_params,
                 **kwargs
             )
+            raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
@@ -2059,10 +2059,10 @@ def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-
             )
         return LROPoller[None](self._client, raw_result, get_long_running_output, polling_method)  # type: ignore
 
-    def _hierarchical_namespace_migration_initial(  # pylint: disable=inconsistent-return-statements,name-too-long
+    def _hierarchical_namespace_migration_initial(  # pylint: disable=name-too-long
         self, resource_group_name: str, account_name: str, request_type: str, **kwargs: Any
-    ) -> None:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> Iterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -2074,7 +2074,7 @@ def _hierarchical_namespace_migration_initial(  # pylint: disable=inconsistent-r
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-01-01"))
-        cls: ClsType[None] = kwargs.pop("cls", None)
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
 
         _request = build_hierarchical_namespace_migration_request(
             resource_group_name=resource_group_name,
@@ -2085,10 +2085,10 @@ def _hierarchical_namespace_migration_initial(  # pylint: disable=inconsistent-r
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -2096,12 +2096,20 @@ def _hierarchical_namespace_migration_initial(  # pylint: disable=inconsistent-r
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
-            return cls(pipeline_response, None, {})  # type: ignore
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
 
     @distributed_trace
     def begin_hierarchical_namespace_migration(
@@ -2134,7 +2142,7 @@ def begin_hierarchical_namespace_migration(
         lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
         cont_token: Optional[str] = kwargs.pop("continuation_token", None)
         if cont_token is None:
-            raw_result = self._hierarchical_namespace_migration_initial(  # type: ignore
+            raw_result = self._hierarchical_namespace_migration_initial(
                 resource_group_name=resource_group_name,
                 account_name=account_name,
                 request_type=request_type,
@@ -2144,6 +2152,7 @@ def begin_hierarchical_namespace_migration(
                 params=_params,
                 **kwargs
             )
+            raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
@@ -2167,10 +2176,10 @@ def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-
             )
         return LROPoller[None](self._client, raw_result, get_long_running_output, polling_method)  # type: ignore
 
-    def _abort_hierarchical_namespace_migration_initial(  # pylint: disable=inconsistent-return-statements,name-too-long
+    def _abort_hierarchical_namespace_migration_initial(  # pylint: disable=name-too-long
         self, resource_group_name: str, account_name: str, **kwargs: Any
-    ) -> None:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> Iterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -2182,7 +2191,7 @@ def _abort_hierarchical_namespace_migration_initial(  # pylint: disable=inconsis
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-01-01"))
-        cls: ClsType[None] = kwargs.pop("cls", None)
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
 
         _request = build_abort_hierarchical_namespace_migration_request(
             resource_group_name=resource_group_name,
@@ -2192,10 +2201,10 @@ def _abort_hierarchical_namespace_migration_initial(  # pylint: disable=inconsis
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -2203,12 +2212,20 @@ def _abort_hierarchical_namespace_migration_initial(  # pylint: disable=inconsis
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
-            return cls(pipeline_response, None, {})  # type: ignore
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
 
     @distributed_trace
     def begin_abort_hierarchical_namespace_migration(  # pylint: disable=name-too-long
@@ -2236,7 +2253,7 @@ def begin_abort_hierarchical_namespace_migration(  # pylint: disable=name-too-lo
         lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
         cont_token: Optional[str] = kwargs.pop("continuation_token", None)
         if cont_token is None:
-            raw_result = self._abort_hierarchical_namespace_migration_initial(  # type: ignore
+            raw_result = self._abort_hierarchical_namespace_migration_initial(
                 resource_group_name=resource_group_name,
                 account_name=account_name,
                 api_version=api_version,
@@ -2245,6 +2262,7 @@ def begin_abort_hierarchical_namespace_migration(  # pylint: disable=name-too-lo
                 params=_params,
                 **kwargs
             )
+            raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
@@ -2268,14 +2286,14 @@ def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-
             )
         return LROPoller[None](self._client, raw_result, get_long_running_output, polling_method)  # type: ignore
 
-    def _customer_initiated_migration_initial(  # pylint: disable=inconsistent-return-statements
+    def _customer_initiated_migration_initial(
         self,
         resource_group_name: str,
         account_name: str,
         parameters: Union[_models.StorageAccountMigration, IO[bytes]],
         **kwargs: Any
-    ) -> None:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> Iterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -2288,7 +2306,7 @@ def _customer_initiated_migration_initial(  # pylint: disable=inconsistent-retur
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-01-01"))
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
-        cls: ClsType[None] = kwargs.pop("cls", None)
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
         _json = None
@@ -2309,10 +2327,10 @@ def _customer_initiated_migration_initial(  # pylint: disable=inconsistent-retur
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -2320,6 +2338,10 @@ def _customer_initiated_migration_initial(  # pylint: disable=inconsistent-retur
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponseAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
@@ -2328,8 +2350,12 @@ def _customer_initiated_migration_initial(  # pylint: disable=inconsistent-retur
         if response.status_code == 202:
             response_headers["Location"] = self._deserialize("str", response.headers.get("Location"))
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
-            return cls(pipeline_response, None, response_headers)  # type: ignore
+            return cls(pipeline_response, deserialized, response_headers)  # type: ignore
+
+        return deserialized  # type: ignore
 
     @overload
     def begin_customer_initiated_migration(
@@ -2437,7 +2463,7 @@ def begin_customer_initiated_migration(
         lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
         cont_token: Optional[str] = kwargs.pop("continuation_token", None)
         if cont_token is None:
-            raw_result = self._customer_initiated_migration_initial(  # type: ignore
+            raw_result = self._customer_initiated_migration_initial(
                 resource_group_name=resource_group_name,
                 account_name=account_name,
                 parameters=parameters,
@@ -2448,6 +2474,7 @@ def begin_customer_initiated_migration(
                 params=_params,
                 **kwargs
             )
+            raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
@@ -2495,7 +2522,7 @@ def get_customer_initiated_migration(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.StorageAccountMigration
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -2518,7 +2545,6 @@ def get_customer_initiated_migration(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -2533,7 +2559,7 @@ def get_customer_initiated_migration(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponseAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountMigration", pipeline_response)
+        deserialized = self._deserialize("StorageAccountMigration", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -2546,8 +2572,8 @@ def _restore_blob_ranges_initial(
         account_name: str,
         parameters: Union[_models.BlobRestoreParameters, IO[bytes]],
         **kwargs: Any
-    ) -> _models.BlobRestoreStatus:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> Iterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -2560,7 +2586,7 @@ def _restore_blob_ranges_initial(
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-01-01"))
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
-        cls: ClsType[_models.BlobRestoreStatus] = kwargs.pop("cls", None)
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
         _json = None
@@ -2581,10 +2607,10 @@ def _restore_blob_ranges_initial(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -2592,14 +2618,14 @@ def _restore_blob_ranges_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response)
-
-        if response.status_code == 202:
-            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response)
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -2712,10 +2738,11 @@ def begin_restore_blob_ranges(
                 params=_params,
                 **kwargs
             )
+            raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):
-            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response)
+            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response.http_response)
             if cls:
                 return cls(pipeline_response, deserialized, {})  # type: ignore
             return deserialized
@@ -2756,7 +2783,7 @@ def revoke_user_delegation_keys(  # pylint: disable=inconsistent-return-statemen
         :rtype: None
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -2778,7 +2805,6 @@ def revoke_user_delegation_keys(  # pylint: disable=inconsistent-return-statemen
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/operations/_table_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/operations/_table_operations.py
index d369af3f9a90..00c9d7cc31ff 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/operations/_table_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/operations/_table_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 (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -350,7 +347,7 @@ def create(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.Table
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -388,7 +385,6 @@ def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -402,7 +398,7 @@ def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("Table", pipeline_response)
+        deserialized = self._deserialize("Table", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -506,7 +502,7 @@ def update(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.Table
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -544,7 +540,6 @@ def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -558,7 +553,7 @@ def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("Table", pipeline_response)
+        deserialized = self._deserialize("Table", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -584,7 +579,7 @@ def get(self, resource_group_name: str, account_name: str, table_name: str, **kw
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.Table
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -607,7 +602,6 @@ def get(self, resource_group_name: str, account_name: str, table_name: str, **kw
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -621,7 +615,7 @@ def get(self, resource_group_name: str, account_name: str, table_name: str, **kw
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("Table", pipeline_response)
+        deserialized = self._deserialize("Table", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -649,7 +643,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,
@@ -672,7 +666,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -710,7 +703,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> It
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-01-01"))
         cls: ClsType[_models.ListTableResource] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -729,7 +722,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -745,7 +737,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/operations/_table_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/operations/_table_services_operations.py
index add8f0feddf3..89ababee7376 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/operations/_table_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/operations/_table_services_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, Literal, Optional, Type, TypeVar, Union, overload
+from typing import Any, Callable, Dict, IO, Literal, Optional, TypeVar, Union, overload
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -19,20 +18,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -185,7 +182,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.ListTableServices
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -207,7 +204,6 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -221,7 +217,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListTableServices", pipeline_response)
+        deserialized = self._deserialize("ListTableServices", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -316,7 +312,7 @@ def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.TableServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -352,7 +348,6 @@ def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -366,7 +361,7 @@ def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("TableServiceProperties", pipeline_response)
+        deserialized = self._deserialize("TableServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -391,7 +386,7 @@ def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2023_01_01.models.TableServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -415,7 +410,6 @@ def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -429,7 +423,7 @@ def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("TableServiceProperties", pipeline_response)
+        deserialized = self._deserialize("TableServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/operations/_usages_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/operations/_usages_operations.py
index 10b5ea1d9165..dd592489da32 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/operations/_usages_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_01_01/operations/_usages_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 (
@@ -20,20 +19,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -105,7 +102,7 @@ def list_by_location(self, location: str, **kwargs: Any) -> Iterable["_models.Us
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-01-01"))
         cls: ClsType[_models.UsageListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -123,7 +120,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -139,7 +135,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/__init__.py
index a860a5c185c9..60980065e1ee 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/__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 ._storage_management_client import StorageManagementClient
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._storage_management_client import StorageManagementClient  # 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__ = [
     "StorageManagementClient",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/_configuration.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/_configuration.py
index ef14ed56fef4..0764dabc5844 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/_configuration.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/_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 StorageManagementClientConfiguration:  # pylint: disable=too-many-instance-attributes,name-too-long
+class StorageManagementClientConfiguration:  # pylint: disable=too-many-instance-attributes
     """Configuration for StorageManagementClient.
 
     Note that all parameters used to create this instance are saved as instance
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/_metadata.json b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/_metadata.json
index fa4c951b32b2..a8ecdfe7db54 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/_metadata.json
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/_metadata.json
@@ -10,8 +10,8 @@
         "azure_arm": true,
         "has_public_lro_operations": true,
         "client_side_validation": false,
-        "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"ARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementClientConfiguration\"], \".._serialization\": [\"Deserializer\", \"Serializer\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}}",
-        "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"AsyncARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"AsyncARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementClientConfiguration\"], \"..._serialization\": [\"Deserializer\", \"Serializer\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"]}}}"
+        "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"ARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementClientConfiguration\"], \".._serialization\": [\"Deserializer\", \"Serializer\"]}, \"stdlib\": {\"typing_extensions\": [\"Self\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}}",
+        "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"AsyncARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"AsyncARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementClientConfiguration\"], \"..._serialization\": [\"Deserializer\", \"Serializer\"]}, \"stdlib\": {\"typing_extensions\": [\"Self\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"]}}}"
     },
     "global_parameters": {
         "sync": {
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/_storage_management_client.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/_storage_management_client.py
index cf6a3bc19465..fbf11af66426 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/_storage_management_client.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/_storage_management_client.py
@@ -8,6 +8,7 @@
 
 from copy import deepcopy
 from typing import Any, TYPE_CHECKING
+from typing_extensions import Self
 
 from azure.core.pipeline import policies
 from azure.core.rest import HttpRequest, HttpResponse
@@ -45,11 +46,10 @@
 )
 
 if TYPE_CHECKING:
-    # pylint: disable=unused-import,ungrouped-imports
     from azure.core.credentials import TokenCredential
 
 
-class StorageManagementClient:  # pylint: disable=client-accepts-api-version-keyword,too-many-instance-attributes
+class StorageManagementClient:  # pylint: disable=too-many-instance-attributes
     """The Azure Storage Management API.
 
     :ivar blob_services: BlobServicesOperations operations
@@ -248,7 +248,7 @@ def _send_request(self, request: HttpRequest, *, stream: bool = False, **kwargs:
     def close(self) -> None:
         self._client.close()
 
-    def __enter__(self) -> "StorageManagementClient":
+    def __enter__(self) -> Self:
         self._client.__enter__()
         return self
 
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/_vendor.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/_vendor.py
deleted file mode 100644
index 0dafe0e287ff..000000000000
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/_vendor.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# --------------------------------------------------------------------------
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License. See License.txt in the project root for license information.
-# Code generated by Microsoft (R) AutoRest Code Generator.
-# Changes may cause incorrect behavior and will be lost if the code is regenerated.
-# --------------------------------------------------------------------------
-
-from azure.core.pipeline.transport import HttpRequest
-
-
-def _convert_request(request, files=None):
-    data = request.content if not files else None
-    request = HttpRequest(method=request.method, url=request.url, headers=request.headers, data=data)
-    if files:
-        request.set_formdata_body(files)
-    return request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/_version.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/_version.py
index 5a163c0afedc..e5754a47ce68 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/_version.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/_version.py
@@ -6,4 +6,4 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-VERSION = "21.2.1"
\ No newline at end of file
+VERSION = "1.0.0b1"
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/__init__.py
index a5c3d2414cfd..ee2b940bd4fc 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/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 ._storage_management_client import StorageManagementClient
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._storage_management_client import StorageManagementClient  # 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__ = [
     "StorageManagementClient",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/_configuration.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/_configuration.py
index 59974e3ace8f..c72e14b6958f 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/_configuration.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/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 StorageManagementClientConfiguration:  # pylint: disable=too-many-instance-attributes,name-too-long
+class StorageManagementClientConfiguration:  # pylint: disable=too-many-instance-attributes
     """Configuration for StorageManagementClient.
 
     Note that all parameters used to create this instance are saved as instance
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/_storage_management_client.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/_storage_management_client.py
index ef0e17dc2ca3..8403397691a6 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/_storage_management_client.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/_storage_management_client.py
@@ -8,6 +8,7 @@
 
 from copy import deepcopy
 from typing import Any, Awaitable, TYPE_CHECKING
+from typing_extensions import Self
 
 from azure.core.pipeline import policies
 from azure.core.rest import AsyncHttpResponse, HttpRequest
@@ -45,11 +46,10 @@
 )
 
 if TYPE_CHECKING:
-    # pylint: disable=unused-import,ungrouped-imports
     from azure.core.credentials_async import AsyncTokenCredential
 
 
-class StorageManagementClient:  # pylint: disable=client-accepts-api-version-keyword,too-many-instance-attributes
+class StorageManagementClient:  # pylint: disable=too-many-instance-attributes
     """The Azure Storage Management API.
 
     :ivar blob_services: BlobServicesOperations operations
@@ -253,7 +253,7 @@ def _send_request(
     async def close(self) -> None:
         await self._client.close()
 
-    async def __aenter__(self) -> "StorageManagementClient":
+    async def __aenter__(self) -> Self:
         await self._client.__aenter__()
         return self
 
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/__init__.py
index e62e153ac4a1..18334b99b3ea 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/__init__.py
@@ -5,34 +5,40 @@
 # 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 ._blob_services_operations import BlobServicesOperations
-from ._blob_containers_operations import BlobContainersOperations
-from ._file_services_operations import FileServicesOperations
-from ._file_shares_operations import FileSharesOperations
-from ._queue_services_operations import QueueServicesOperations
-from ._queue_operations import QueueOperations
-from ._operations import Operations
-from ._skus_operations import SkusOperations
-from ._storage_accounts_operations import StorageAccountsOperations
-from ._deleted_accounts_operations import DeletedAccountsOperations
-from ._usages_operations import UsagesOperations
-from ._management_policies_operations import ManagementPoliciesOperations
-from ._blob_inventory_policies_operations import BlobInventoryPoliciesOperations
-from ._private_endpoint_connections_operations import PrivateEndpointConnectionsOperations
-from ._private_link_resources_operations import PrivateLinkResourcesOperations
-from ._object_replication_policies_operations import ObjectReplicationPoliciesOperations
-from ._local_users_operations import LocalUsersOperations
-from ._encryption_scopes_operations import EncryptionScopesOperations
-from ._table_services_operations import TableServicesOperations
-from ._table_operations import TableOperations
-from ._network_security_perimeter_configurations_operations import NetworkSecurityPerimeterConfigurationsOperations
-from ._storage_task_assignments_operations import StorageTaskAssignmentsOperations
-from ._storage_task_assignments_instances_report_operations import StorageTaskAssignmentsInstancesReportOperations
-from ._storage_task_assignment_instances_report_operations import StorageTaskAssignmentInstancesReportOperations
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._blob_services_operations import BlobServicesOperations  # type: ignore
+from ._blob_containers_operations import BlobContainersOperations  # type: ignore
+from ._file_services_operations import FileServicesOperations  # type: ignore
+from ._file_shares_operations import FileSharesOperations  # type: ignore
+from ._queue_services_operations import QueueServicesOperations  # type: ignore
+from ._queue_operations import QueueOperations  # type: ignore
+from ._operations import Operations  # type: ignore
+from ._skus_operations import SkusOperations  # type: ignore
+from ._storage_accounts_operations import StorageAccountsOperations  # type: ignore
+from ._deleted_accounts_operations import DeletedAccountsOperations  # type: ignore
+from ._usages_operations import UsagesOperations  # type: ignore
+from ._management_policies_operations import ManagementPoliciesOperations  # type: ignore
+from ._blob_inventory_policies_operations import BlobInventoryPoliciesOperations  # type: ignore
+from ._private_endpoint_connections_operations import PrivateEndpointConnectionsOperations  # type: ignore
+from ._private_link_resources_operations import PrivateLinkResourcesOperations  # type: ignore
+from ._object_replication_policies_operations import ObjectReplicationPoliciesOperations  # type: ignore
+from ._local_users_operations import LocalUsersOperations  # type: ignore
+from ._encryption_scopes_operations import EncryptionScopesOperations  # type: ignore
+from ._table_services_operations import TableServicesOperations  # type: ignore
+from ._table_operations import TableOperations  # type: ignore
+from ._network_security_perimeter_configurations_operations import NetworkSecurityPerimeterConfigurationsOperations  # type: ignore
+from ._storage_task_assignments_operations import StorageTaskAssignmentsOperations  # type: ignore
+from ._storage_task_assignments_instances_report_operations import StorageTaskAssignmentsInstancesReportOperations  # type: ignore
+from ._storage_task_assignment_instances_report_operations import StorageTaskAssignmentInstancesReportOperations  # 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__ = [
@@ -61,5 +67,5 @@
     "StorageTaskAssignmentsInstancesReportOperations",
     "StorageTaskAssignmentInstancesReportOperations",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_blob_containers_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_blob_containers_operations.py
index b9f45e4db5e4..107ac64f3da2 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_blob_containers_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_blob_containers_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,20 @@
 # --------------------------------------------------------------------------
 from io import IOBase
 import sys
-from typing import Any, AsyncIterable, Callable, Dict, IO, Literal, Optional, Type, TypeVar, Union, cast, overload
+from typing import (
+    Any,
+    AsyncIterable,
+    AsyncIterator,
+    Callable,
+    Dict,
+    IO,
+    Literal,
+    Optional,
+    TypeVar,
+    Union,
+    cast,
+    overload,
+)
 import urllib.parse
 
 from azure.core.async_paging import AsyncItemPaged, AsyncList
@@ -18,12 +31,13 @@
     ResourceExistsError,
     ResourceNotFoundError,
     ResourceNotModifiedError,
+    StreamClosedError,
+    StreamConsumedError,
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
 from azure.core.polling import AsyncLROPoller, AsyncNoPolling, AsyncPollingMethod
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
@@ -31,7 +45,6 @@
 from azure.mgmt.core.polling.async_arm_polling import AsyncARMPolling
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._blob_containers_operations import (
     build_clear_legal_hold_request,
     build_create_or_update_immutability_policy_request,
@@ -52,7 +65,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]]
 
@@ -117,7 +130,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-05-01"))
         cls: ClsType[_models.ListContainerItems] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -139,7 +152,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -155,7 +167,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -290,7 +301,7 @@ async def create(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -325,7 +336,6 @@ async def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -339,11 +349,7 @@ async def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("BlobContainer", pipeline_response)
-
-        if response.status_code == 201:
-            deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -453,7 +459,7 @@ async def update(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -488,7 +494,6 @@ async def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -502,7 +507,7 @@ async def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -531,7 +536,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -554,7 +559,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -568,7 +572,7 @@ async def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -576,9 +580,7 @@ async def get(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, container_name: str, **kwargs: Any
-    ) -> None:
+    async def delete(self, resource_group_name: str, account_name: str, container_name: str, **kwargs: Any) -> None:
         """Deletes specified container under its account.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -597,7 +599,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,
@@ -620,7 +622,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -743,7 +744,7 @@ async def set_legal_hold(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.LegalHold
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -778,7 +779,6 @@ async def set_legal_hold(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -792,7 +792,7 @@ async def set_legal_hold(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LegalHold", pipeline_response)
+        deserialized = self._deserialize("LegalHold", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -902,7 +902,7 @@ async def clear_legal_hold(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.LegalHold
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -937,7 +937,6 @@ async def clear_legal_hold(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -951,7 +950,7 @@ async def clear_legal_hold(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LegalHold", pipeline_response)
+        deserialized = self._deserialize("LegalHold", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -985,9 +984,9 @@ async def create_or_update_immutability_policy(
          letters and dash (-) only. Every dash (-) character must be immediately preceded and followed
          by a letter or number. Required.
         :type container_name: str
-        :param if_match: The entity state (ETag) version of the immutability policy to update. A value
-         of "*" can be used to apply the operation only if the immutability policy already exists. If
-         omitted, this operation will always be applied. Default value is None.
+        :param if_match: The entity state (ETag) version of the immutability policy to update must be
+         returned to the server for all update operations. The ETag value must include the leading and
+         trailing double quotes as returned by the service. Default value is None.
         :type if_match: str
         :param parameters: The ImmutabilityPolicy Properties that will be created or updated to a blob
          container. Default value is None.
@@ -1027,9 +1026,9 @@ async def create_or_update_immutability_policy(
          letters and dash (-) only. Every dash (-) character must be immediately preceded and followed
          by a letter or number. Required.
         :type container_name: str
-        :param if_match: The entity state (ETag) version of the immutability policy to update. A value
-         of "*" can be used to apply the operation only if the immutability policy already exists. If
-         omitted, this operation will always be applied. Default value is None.
+        :param if_match: The entity state (ETag) version of the immutability policy to update must be
+         returned to the server for all update operations. The ETag value must include the leading and
+         trailing double quotes as returned by the service. Default value is None.
         :type if_match: str
         :param parameters: The ImmutabilityPolicy Properties that will be created or updated to a blob
          container. Default value is None.
@@ -1067,9 +1066,9 @@ async def create_or_update_immutability_policy(
          letters and dash (-) only. Every dash (-) character must be immediately preceded and followed
          by a letter or number. Required.
         :type container_name: str
-        :param if_match: The entity state (ETag) version of the immutability policy to update. A value
-         of "*" can be used to apply the operation only if the immutability policy already exists. If
-         omitted, this operation will always be applied. Default value is None.
+        :param if_match: The entity state (ETag) version of the immutability policy to update must be
+         returned to the server for all update operations. The ETag value must include the leading and
+         trailing double quotes as returned by the service. Default value is None.
         :type if_match: str
         :param parameters: The ImmutabilityPolicy Properties that will be created or updated to a blob
          container. Is either a ImmutabilityPolicy type or a IO[bytes] type. Default value is None.
@@ -1078,7 +1077,7 @@ async def create_or_update_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1119,7 +1118,6 @@ async def create_or_update_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1136,7 +1134,7 @@ async def create_or_update_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1167,15 +1165,15 @@ async def get_immutability_policy(
          letters and dash (-) only. Every dash (-) character must be immediately preceded and followed
          by a letter or number. Required.
         :type container_name: str
-        :param if_match: The entity state (ETag) version of the immutability policy to update. A value
-         of "*" can be used to apply the operation only if the immutability policy already exists. If
-         omitted, this operation will always be applied. Default value is None.
+        :param if_match: The entity state (ETag) version of the immutability policy to update must be
+         returned to the server for all update operations. The ETag value must include the leading and
+         trailing double quotes as returned by the service. Default value is None.
         :type if_match: str
         :return: ImmutabilityPolicy or the result of cls(response)
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1201,7 +1199,6 @@ async def get_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1218,7 +1215,7 @@ async def get_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1246,15 +1243,15 @@ async def delete_immutability_policy(
          letters and dash (-) only. Every dash (-) character must be immediately preceded and followed
          by a letter or number. Required.
         :type container_name: str
-        :param if_match: The entity state (ETag) version of the immutability policy to update. A value
-         of "*" can be used to apply the operation only if the immutability policy already exists. If
-         omitted, this operation will always be applied. Required.
+        :param if_match: The entity state (ETag) version of the immutability policy to update must be
+         returned to the server for all update operations. The ETag value must include the leading and
+         trailing double quotes as returned by the service. Required.
         :type if_match: str
         :return: ImmutabilityPolicy or the result of cls(response)
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1280,7 +1277,6 @@ async def delete_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1297,7 +1293,7 @@ async def delete_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1323,15 +1319,15 @@ async def lock_immutability_policy(
          letters and dash (-) only. Every dash (-) character must be immediately preceded and followed
          by a letter or number. Required.
         :type container_name: str
-        :param if_match: The entity state (ETag) version of the immutability policy to update. A value
-         of "*" can be used to apply the operation only if the immutability policy already exists. If
-         omitted, this operation will always be applied. Required.
+        :param if_match: The entity state (ETag) version of the immutability policy to update must be
+         returned to the server for all update operations. The ETag value must include the leading and
+         trailing double quotes as returned by the service. Required.
         :type if_match: str
         :return: ImmutabilityPolicy or the result of cls(response)
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1355,7 +1351,6 @@ async def lock_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1372,7 +1367,7 @@ async def lock_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1407,9 +1402,9 @@ async def extend_immutability_policy(
          letters and dash (-) only. Every dash (-) character must be immediately preceded and followed
          by a letter or number. Required.
         :type container_name: str
-        :param if_match: The entity state (ETag) version of the immutability policy to update. A value
-         of "*" can be used to apply the operation only if the immutability policy already exists. If
-         omitted, this operation will always be applied. Required.
+        :param if_match: The entity state (ETag) version of the immutability policy to update must be
+         returned to the server for all update operations. The ETag value must include the leading and
+         trailing double quotes as returned by the service. Required.
         :type if_match: str
         :param parameters: The ImmutabilityPolicy Properties that will be extended for a blob
          container. Default value is None.
@@ -1450,9 +1445,9 @@ async def extend_immutability_policy(
          letters and dash (-) only. Every dash (-) character must be immediately preceded and followed
          by a letter or number. Required.
         :type container_name: str
-        :param if_match: The entity state (ETag) version of the immutability policy to update. A value
-         of "*" can be used to apply the operation only if the immutability policy already exists. If
-         omitted, this operation will always be applied. Required.
+        :param if_match: The entity state (ETag) version of the immutability policy to update must be
+         returned to the server for all update operations. The ETag value must include the leading and
+         trailing double quotes as returned by the service. Required.
         :type if_match: str
         :param parameters: The ImmutabilityPolicy Properties that will be extended for a blob
          container. Default value is None.
@@ -1491,9 +1486,9 @@ async def extend_immutability_policy(
          letters and dash (-) only. Every dash (-) character must be immediately preceded and followed
          by a letter or number. Required.
         :type container_name: str
-        :param if_match: The entity state (ETag) version of the immutability policy to update. A value
-         of "*" can be used to apply the operation only if the immutability policy already exists. If
-         omitted, this operation will always be applied. Required.
+        :param if_match: The entity state (ETag) version of the immutability policy to update must be
+         returned to the server for all update operations. The ETag value must include the leading and
+         trailing double quotes as returned by the service. Required.
         :type if_match: str
         :param parameters: The ImmutabilityPolicy Properties that will be extended for a blob
          container. Is either a ImmutabilityPolicy type or a IO[bytes] type. Default value is None.
@@ -1502,7 +1497,7 @@ async def extend_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1541,7 +1536,6 @@ async def extend_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1558,7 +1552,7 @@ async def extend_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1668,7 +1662,7 @@ async def lease(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.LeaseContainerResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1706,7 +1700,6 @@ async def lease(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1720,17 +1713,17 @@ async def lease(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LeaseContainerResponse", pipeline_response)
+        deserialized = self._deserialize("LeaseContainerResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
 
         return deserialized  # type: ignore
 
-    async def _object_level_worm_initial(  # pylint: disable=inconsistent-return-statements
+    async def _object_level_worm_initial(
         self, resource_group_name: str, account_name: str, container_name: str, **kwargs: Any
-    ) -> None:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1742,7 +1735,7 @@ async def _object_level_worm_initial(  # pylint: disable=inconsistent-return-sta
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-05-01"))
-        cls: ClsType[None] = kwargs.pop("cls", None)
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
 
         _request = build_object_level_worm_request(
             resource_group_name=resource_group_name,
@@ -1753,10 +1746,10 @@ async def _object_level_worm_initial(  # pylint: disable=inconsistent-return-sta
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -1764,11 +1757,19 @@ async def _object_level_worm_initial(  # pylint: disable=inconsistent-return-sta
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
-            return cls(pipeline_response, None, {})  # type: ignore
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
 
     @distributed_trace_async
     async def begin_object_level_worm(
@@ -1804,7 +1805,7 @@ async def begin_object_level_worm(
         lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
         cont_token: Optional[str] = kwargs.pop("continuation_token", None)
         if cont_token is None:
-            raw_result = await self._object_level_worm_initial(  # type: ignore
+            raw_result = await self._object_level_worm_initial(
                 resource_group_name=resource_group_name,
                 account_name=account_name,
                 container_name=container_name,
@@ -1814,6 +1815,7 @@ async def begin_object_level_worm(
                 params=_params,
                 **kwargs
             )
+            await raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_blob_inventory_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_blob_inventory_policies_operations.py
index 0fa7a978bdb8..16c02ffba5a3 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_blob_inventory_policies_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_blob_inventory_policies_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._blob_inventory_policies_operations import (
     build_create_or_update_request,
     build_delete_request,
@@ -40,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]]
 
@@ -90,7 +87,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.BlobInventoryPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -113,7 +110,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -127,7 +123,7 @@ async def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response)
+        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -231,7 +227,7 @@ async def create_or_update(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.BlobInventoryPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -266,7 +262,6 @@ async def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -280,7 +275,7 @@ async def create_or_update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response)
+        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -288,7 +283,7 @@ async def create_or_update(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
+    async def delete(
         self,
         resource_group_name: str,
         account_name: str,
@@ -312,7 +307,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,
@@ -335,7 +330,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -376,7 +370,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-05-01"))
         cls: ClsType[_models.ListBlobInventoryPolicy] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -395,7 +389,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -411,7 +404,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_blob_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_blob_services_operations.py
index 11bfbe35b07f..66c38946e41b 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_blob_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_blob_services_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, Literal, Optional, Type, TypeVar, Union, overload
+from typing import Any, AsyncIterable, Callable, Dict, IO, Literal, Optional, TypeVar, Union, overload
 import urllib.parse
 
 from azure.core.async_paging import AsyncItemPaged, AsyncList
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._blob_services_operations import (
     build_get_service_properties_request,
     build_list_request,
@@ -39,7 +36,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 +86,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-05-01"))
         cls: ClsType[_models.BlobServiceItems] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -108,7 +105,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -124,7 +120,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -241,7 +236,7 @@ async def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.BlobServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -277,7 +272,6 @@ async def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -291,7 +285,7 @@ async def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobServiceProperties", pipeline_response)
+        deserialized = self._deserialize("BlobServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -316,7 +310,7 @@ async def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.BlobServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -340,7 +334,6 @@ async def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -354,7 +347,7 @@ async def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobServiceProperties", pipeline_response)
+        deserialized = self._deserialize("BlobServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_deleted_accounts_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_deleted_accounts_operations.py
index 9a75d7529c31..c389b47e2663 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_deleted_accounts_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_deleted_accounts_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
@@ -20,21 +19,19 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._deleted_accounts_operations import build_get_request, build_list_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
 
@@ -74,7 +71,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.DeletedAccount"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-05-01"))
         cls: ClsType[_models.DeletedAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -91,7 +88,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -107,7 +103,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -149,7 +144,7 @@ async def get(self, deleted_account_name: str, location: str, **kwargs: Any) ->
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.DeletedAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -171,7 +166,6 @@ async def get(self, deleted_account_name: str, location: str, **kwargs: Any) ->
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -186,7 +180,7 @@ async def get(self, deleted_account_name: str, location: str, **kwargs: Any) ->
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("DeletedAccount", pipeline_response)
+        deserialized = self._deserialize("DeletedAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_encryption_scopes_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_encryption_scopes_operations.py
index 19118fc7b53a..fc5d1d347bc1 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_encryption_scopes_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_encryption_scopes_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._encryption_scopes_operations import (
     build_get_request,
     build_list_request,
@@ -40,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]]
 
@@ -173,7 +170,7 @@ async def put(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.EncryptionScope
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -208,7 +205,6 @@ async def put(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -223,11 +219,7 @@ async def put(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("EncryptionScope", pipeline_response)
-
-        if response.status_code == 201:
-            deserialized = self._deserialize("EncryptionScope", pipeline_response)
+        deserialized = self._deserialize("EncryptionScope", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -337,7 +329,7 @@ async def patch(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.EncryptionScope
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -372,7 +364,6 @@ async def patch(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -387,7 +378,7 @@ async def patch(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("EncryptionScope", pipeline_response)
+        deserialized = self._deserialize("EncryptionScope", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -416,7 +407,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.EncryptionScope
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -439,7 +430,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -454,7 +444,7 @@ async def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("EncryptionScope", pipeline_response)
+        deserialized = self._deserialize("EncryptionScope", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -500,7 +490,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-05-01"))
         cls: ClsType[_models.EncryptionScopeListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -522,7 +512,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -538,7 +527,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_file_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_file_services_operations.py
index b7eff2d9771a..beec036e05e6 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_file_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_file_services_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, Literal, Optional, Type, TypeVar, Union, overload
+from typing import Any, Callable, Dict, IO, Literal, Optional, TypeVar, Union, overload
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -19,14 +18,12 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._file_services_operations import (
     build_get_service_properties_request,
     build_list_request,
@@ -36,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]]
 
@@ -76,7 +73,7 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.FileServiceItems
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -98,7 +95,6 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -112,7 +108,7 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileServiceItems", pipeline_response)
+        deserialized = self._deserialize("FileServiceItems", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -207,7 +203,7 @@ async def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.FileServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -243,7 +239,6 @@ async def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -257,7 +252,7 @@ async def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileServiceProperties", pipeline_response)
+        deserialized = self._deserialize("FileServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -282,7 +277,7 @@ async def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.FileServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -306,7 +301,6 @@ async def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -320,7 +314,7 @@ async def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileServiceProperties", pipeline_response)
+        deserialized = self._deserialize("FileServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_file_shares_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_file_shares_operations.py
index 263ba0a63da7..d8c7b581baf8 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_file_shares_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_file_shares_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._file_shares_operations import (
     build_create_request,
     build_delete_request,
@@ -43,7 +40,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]]
 
@@ -108,7 +105,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-05-01"))
         cls: ClsType[_models.FileShareItems] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -130,7 +127,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -146,7 +142,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -293,7 +288,7 @@ async def create(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.FileShare
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -329,7 +324,6 @@ async def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -343,11 +337,7 @@ async def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("FileShare", pipeline_response)
-
-        if response.status_code == 201:
-            deserialized = self._deserialize("FileShare", pipeline_response)
+        deserialized = self._deserialize("FileShare", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -457,7 +447,7 @@ async def update(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.FileShare
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -492,7 +482,6 @@ async def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -506,7 +495,7 @@ async def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileShare", pipeline_response)
+        deserialized = self._deserialize("FileShare", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -547,7 +536,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.FileShare
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -572,7 +561,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -586,7 +574,7 @@ async def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileShare", pipeline_response)
+        deserialized = self._deserialize("FileShare", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -594,7 +582,7 @@ async def get(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
+    async def delete(
         self,
         resource_group_name: str,
         account_name: str,
@@ -631,7 +619,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,
@@ -656,7 +644,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -674,7 +661,7 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             return cls(pipeline_response, None, {})  # type: ignore
 
     @overload
-    async def restore(  # pylint: disable=inconsistent-return-statements
+    async def restore(
         self,
         resource_group_name: str,
         account_name: str,
@@ -709,7 +696,7 @@ async def restore(  # pylint: disable=inconsistent-return-statements
         """
 
     @overload
-    async def restore(  # pylint: disable=inconsistent-return-statements
+    async def restore(
         self,
         resource_group_name: str,
         account_name: str,
@@ -744,7 +731,7 @@ async def restore(  # pylint: disable=inconsistent-return-statements
         """
 
     @distributed_trace_async
-    async def restore(  # pylint: disable=inconsistent-return-statements
+    async def restore(
         self,
         resource_group_name: str,
         account_name: str,
@@ -772,7 +759,7 @@ async def restore(  # 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,
@@ -807,7 +794,6 @@ async def restore(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -939,7 +925,7 @@ async def lease(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.LeaseShareResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -978,7 +964,6 @@ async def lease(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -995,7 +980,7 @@ async def lease(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("LeaseShareResponse", pipeline_response)
+        deserialized = self._deserialize("LeaseShareResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_local_users_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_local_users_operations.py
index d57fb96e944a..73e1885ff695 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_local_users_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_local_users_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._local_users_operations import (
     build_create_or_update_request,
     build_delete_request,
@@ -42,7 +39,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]]
 
@@ -106,7 +103,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-05-01"))
         cls: ClsType[_models.LocalUsers] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -128,7 +125,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -144,7 +140,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -192,7 +187,7 @@ async def get(self, resource_group_name: str, account_name: str, username: str,
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.LocalUser
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -215,7 +210,6 @@ async def get(self, resource_group_name: str, account_name: str, username: str,
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -230,7 +224,7 @@ async def get(self, resource_group_name: str, account_name: str, username: str,
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LocalUser", pipeline_response)
+        deserialized = self._deserialize("LocalUser", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -334,7 +328,7 @@ async def create_or_update(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.LocalUser
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -369,7 +363,6 @@ async def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -384,7 +377,7 @@ async def create_or_update(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LocalUser", pipeline_response)
+        deserialized = self._deserialize("LocalUser", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -392,9 +385,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, account_name: str, username: str, **kwargs: Any
-    ) -> None:
+    async def delete(self, resource_group_name: str, account_name: str, username: str, **kwargs: Any) -> None:
         """Deletes the local user associated with the specified storage account.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -411,7 +402,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,
@@ -434,7 +425,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -472,7 +462,7 @@ async def list_keys(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.LocalUserKeys
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -495,7 +485,6 @@ async def list_keys(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -510,7 +499,7 @@ async def list_keys(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LocalUserKeys", pipeline_response)
+        deserialized = self._deserialize("LocalUserKeys", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -537,7 +526,7 @@ async def regenerate_password(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.LocalUserRegeneratePasswordResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -560,7 +549,6 @@ async def regenerate_password(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -575,7 +563,7 @@ async def regenerate_password(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LocalUserRegeneratePasswordResult", pipeline_response)
+        deserialized = self._deserialize("LocalUserRegeneratePasswordResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_management_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_management_policies_operations.py
index 734fec88534a..10f82ca8c8a8 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_management_policies_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_management_policies_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,
@@ -19,14 +18,12 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._management_policies_operations import (
     build_create_or_update_request,
     build_delete_request,
@@ -36,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]]
 
@@ -86,7 +83,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.ManagementPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -109,7 +106,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -123,7 +119,7 @@ async def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ManagementPolicy", pipeline_response)
+        deserialized = self._deserialize("ManagementPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -227,7 +223,7 @@ async def create_or_update(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.ManagementPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -262,7 +258,6 @@ async def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -276,7 +271,7 @@ async def create_or_update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ManagementPolicy", pipeline_response)
+        deserialized = self._deserialize("ManagementPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -284,7 +279,7 @@ async def create_or_update(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
+    async def delete(
         self,
         resource_group_name: str,
         account_name: str,
@@ -308,7 +303,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,
@@ -331,7 +326,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_network_security_perimeter_configurations_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_network_security_perimeter_configurations_operations.py
index a27e3ba1f437..88e591f6abaa 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_network_security_perimeter_configurations_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_network_security_perimeter_configurations_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, Union, cast
+from typing import Any, AsyncIterable, AsyncIterator, Callable, Dict, Optional, TypeVar, Union, cast
 import urllib.parse
 
 from azure.core.async_paging import AsyncItemPaged, AsyncList
@@ -17,12 +16,13 @@
     ResourceExistsError,
     ResourceNotFoundError,
     ResourceNotModifiedError,
+    StreamClosedError,
+    StreamConsumedError,
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
 from azure.core.polling import AsyncLROPoller, AsyncNoPolling, AsyncPollingMethod
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
@@ -30,7 +30,6 @@
 from azure.mgmt.core.polling.async_arm_polling import AsyncARMPolling
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._network_security_perimeter_configurations_operations import (
     build_get_request,
     build_list_request,
@@ -40,7 +39,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]]
 
@@ -69,6 +68,7 @@ def __init__(self, *args, **kwargs) -> None:
     def list(
         self, resource_group_name: str, account_name: str, **kwargs: Any
     ) -> AsyncIterable["_models.NetworkSecurityPerimeterConfiguration"]:
+        # pylint: disable=line-too-long
         """Gets list of effective NetworkSecurityPerimeterConfiguration for storage account.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -90,7 +90,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-05-01"))
         cls: ClsType[_models.NetworkSecurityPerimeterConfigurationList] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -109,7 +109,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -125,7 +124,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -179,7 +177,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.NetworkSecurityPerimeterConfiguration
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -202,7 +200,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -217,21 +214,21 @@ async def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponseAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("NetworkSecurityPerimeterConfiguration", pipeline_response)
+        deserialized = self._deserialize("NetworkSecurityPerimeterConfiguration", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
 
         return deserialized  # type: ignore
 
-    async def _reconcile_initial(  # pylint: disable=inconsistent-return-statements
+    async def _reconcile_initial(
         self,
         resource_group_name: str,
         account_name: str,
         network_security_perimeter_configuration_name: str,
         **kwargs: Any
-    ) -> None:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -243,7 +240,7 @@ async def _reconcile_initial(  # pylint: disable=inconsistent-return-statements
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-05-01"))
-        cls: ClsType[None] = kwargs.pop("cls", None)
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
 
         _request = build_reconcile_request(
             resource_group_name=resource_group_name,
@@ -254,10 +251,10 @@ async def _reconcile_initial(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -265,6 +262,10 @@ async def _reconcile_initial(  # pylint: disable=inconsistent-return-statements
         response = pipeline_response.http_response
 
         if response.status_code not in [202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponseAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
@@ -272,8 +273,12 @@ async def _reconcile_initial(  # pylint: disable=inconsistent-return-statements
         response_headers = {}
         response_headers["Location"] = self._deserialize("str", response.headers.get("Location"))
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
-            return cls(pipeline_response, None, response_headers)  # type: ignore
+            return cls(pipeline_response, deserialized, response_headers)  # type: ignore
+
+        return deserialized  # type: ignore
 
     @distributed_trace_async
     async def begin_reconcile(
@@ -308,7 +313,7 @@ async def begin_reconcile(
         lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
         cont_token: Optional[str] = kwargs.pop("continuation_token", None)
         if cont_token is None:
-            raw_result = await self._reconcile_initial(  # type: ignore
+            raw_result = await self._reconcile_initial(
                 resource_group_name=resource_group_name,
                 account_name=account_name,
                 network_security_perimeter_configuration_name=network_security_perimeter_configuration_name,
@@ -318,6 +323,7 @@ async def begin_reconcile(
                 params=_params,
                 **kwargs
             )
+            await raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_object_replication_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_object_replication_policies_operations.py
index 73f95a92ffc6..6bfcebc13883 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_object_replication_policies_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_object_replication_policies_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._object_replication_policies_operations import (
     build_create_or_update_request,
     build_delete_request,
@@ -40,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]]
 
@@ -90,7 +87,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-05-01"))
         cls: ClsType[_models.ObjectReplicationPolicies] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -109,7 +106,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -125,7 +121,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -177,7 +172,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.ObjectReplicationPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -200,7 +195,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -215,7 +209,7 @@ async def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response)
+        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -325,7 +319,7 @@ async def create_or_update(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.ObjectReplicationPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -360,7 +354,6 @@ async def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -375,7 +368,7 @@ async def create_or_update(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response)
+        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -383,7 +376,7 @@ async def create_or_update(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
+    async def delete(
         self, resource_group_name: str, account_name: str, object_replication_policy_id: str, **kwargs: Any
     ) -> None:
         """Deletes the object replication policy associated with the specified storage account.
@@ -404,7 +397,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,
@@ -427,7 +420,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_operations.py
index 7aa1c1baa1b0..400da45c98ca 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/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
@@ -20,20 +19,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._operations import build_list_request
 
 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]]
 
@@ -73,7 +70,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.Operation"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-05-01"))
         cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -89,7 +86,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -105,7 +101,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_private_endpoint_connections_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_private_endpoint_connections_operations.py
index 6a5828fa9867..81086b4016f2 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_private_endpoint_connections_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_private_endpoint_connections_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._private_endpoint_connections_operations import (
     build_delete_request,
     build_get_request,
@@ -40,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]]
 
@@ -90,7 +87,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-05-01"))
         cls: ClsType[_models.PrivateEndpointConnectionListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -109,7 +106,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -125,7 +121,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -174,7 +169,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.PrivateEndpointConnection
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -197,7 +192,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -212,7 +206,7 @@ async def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response)
+        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -313,7 +307,7 @@ async def put(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.PrivateEndpointConnection
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -348,7 +342,6 @@ async def put(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -363,7 +356,7 @@ async def put(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response)
+        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -371,7 +364,7 @@ async def put(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
+    async def delete(
         self, resource_group_name: str, account_name: str, private_endpoint_connection_name: str, **kwargs: Any
     ) -> None:
         """Deletes the specified private endpoint connection associated with the storage account.
@@ -390,7 +383,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,
@@ -413,7 +406,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_private_link_resources_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_private_link_resources_operations.py
index e8dfc6f0cb42..71e2d534c4ff 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_private_link_resources_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_private_link_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, Optional, Type, TypeVar
+from typing import Any, Callable, Dict, Optional, TypeVar
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -18,20 +17,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._private_link_resources_operations import build_list_by_storage_account_request
 
 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]]
 
@@ -73,7 +70,7 @@ async def list_by_storage_account(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.PrivateLinkResourceListResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -95,7 +92,6 @@ async def list_by_storage_account(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -109,7 +105,7 @@ async def list_by_storage_account(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("PrivateLinkResourceListResult", pipeline_response)
+        deserialized = self._deserialize("PrivateLinkResourceListResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_queue_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_queue_operations.py
index 983152d2a530..895458d188fa 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_queue_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_queue_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._queue_operations import (
     build_create_request,
     build_delete_request,
@@ -41,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]]
 
@@ -166,7 +163,7 @@ async def create(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.StorageQueue
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -201,7 +198,6 @@ async def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -215,7 +211,7 @@ async def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageQueue", pipeline_response)
+        deserialized = self._deserialize("StorageQueue", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -322,7 +318,7 @@ async def update(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.StorageQueue
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -357,7 +353,6 @@ async def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -371,7 +366,7 @@ async def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageQueue", pipeline_response)
+        deserialized = self._deserialize("StorageQueue", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -400,7 +395,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.StorageQueue
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -423,7 +418,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -437,7 +431,7 @@ async def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageQueue", pipeline_response)
+        deserialized = self._deserialize("StorageQueue", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -445,9 +439,7 @@ async def get(
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, queue_name: str, **kwargs: Any
-    ) -> None:
+    async def delete(self, resource_group_name: str, account_name: str, queue_name: str, **kwargs: Any) -> None:
         """Deletes the queue with the specified queue name, under the specified account if it exists.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -466,7 +458,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,
@@ -489,7 +481,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -541,7 +532,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-05-01"))
         cls: ClsType[_models.ListQueueResource] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -562,7 +553,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -578,7 +568,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_queue_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_queue_services_operations.py
index 8e6414cf7729..c86b8564fbc1 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_queue_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_queue_services_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, Literal, Optional, Type, TypeVar, Union, overload
+from typing import Any, Callable, Dict, IO, Literal, Optional, TypeVar, Union, overload
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -19,14 +18,12 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._queue_services_operations import (
     build_get_service_properties_request,
     build_list_request,
@@ -36,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]]
 
@@ -76,7 +73,7 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.ListQueueServices
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -98,7 +95,6 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -112,7 +108,7 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListQueueServices", pipeline_response)
+        deserialized = self._deserialize("ListQueueServices", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -207,7 +203,7 @@ async def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.QueueServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -243,7 +239,6 @@ async def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -257,7 +252,7 @@ async def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("QueueServiceProperties", pipeline_response)
+        deserialized = self._deserialize("QueueServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -282,7 +277,7 @@ async def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.QueueServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -306,7 +301,6 @@ async def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -320,7 +314,7 @@ async def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("QueueServiceProperties", pipeline_response)
+        deserialized = self._deserialize("QueueServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_skus_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_skus_operations.py
index 8c33030e8b6b..807446895b47 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_skus_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_skus_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
@@ -20,20 +19,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._skus_operations import build_list_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
 
@@ -73,7 +70,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.SkuInformation"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-05-01"))
         cls: ClsType[_models.StorageSkuListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -90,7 +87,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -106,7 +102,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_storage_accounts_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_storage_accounts_operations.py
index 4894f9f5100a..a1c0bd1bcdc9 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_storage_accounts_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_storage_accounts_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,20 @@
 # --------------------------------------------------------------------------
 from io import IOBase
 import sys
-from typing import Any, AsyncIterable, Callable, Dict, IO, Literal, Optional, Type, TypeVar, Union, cast, overload
+from typing import (
+    Any,
+    AsyncIterable,
+    AsyncIterator,
+    Callable,
+    Dict,
+    IO,
+    Literal,
+    Optional,
+    TypeVar,
+    Union,
+    cast,
+    overload,
+)
 import urllib.parse
 
 from azure.core.async_paging import AsyncItemPaged, AsyncList
@@ -18,12 +31,13 @@
     ResourceExistsError,
     ResourceNotFoundError,
     ResourceNotModifiedError,
+    StreamClosedError,
+    StreamConsumedError,
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
 from azure.core.polling import AsyncLROPoller, AsyncNoPolling, AsyncPollingMethod
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
@@ -31,7 +45,6 @@
 from azure.mgmt.core.polling.async_arm_polling import AsyncARMPolling
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._storage_accounts_operations import (
     build_abort_hierarchical_namespace_migration_request,
     build_check_name_availability_request,
@@ -56,7 +69,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]]
 
@@ -139,7 +152,7 @@ async def check_name_availability(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.CheckNameAvailabilityResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -171,7 +184,6 @@ async def check_name_availability(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -185,7 +197,7 @@ async def check_name_availability(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response)
+        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -198,8 +210,8 @@ async def _create_initial(
         account_name: str,
         parameters: Union[_models.StorageAccountCreateParameters, IO[bytes]],
         **kwargs: Any
-    ) -> Optional[_models.StorageAccount]:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -212,7 +224,7 @@ async def _create_initial(
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-05-01"))
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
-        cls: ClsType[Optional[_models.StorageAccount]] = kwargs.pop("cls", None)
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
         _json = None
@@ -233,10 +245,10 @@ async def _create_initial(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -244,12 +256,14 @@ async def _create_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = None
-        if response.status_code == 200:
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -375,10 +389,11 @@ async def begin_create(
                 params=_params,
                 **kwargs
             )
+            await raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+            deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
             if cls:
                 return cls(pipeline_response, deserialized, {})  # type: ignore
             return deserialized
@@ -401,9 +416,7 @@ def get_long_running_output(pipeline_response):
         )
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, **kwargs: Any
-    ) -> None:
+    async def delete(self, resource_group_name: str, account_name: str, **kwargs: Any) -> None:
         """Deletes a storage account in Microsoft Azure.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -417,7 +430,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,
@@ -439,7 +452,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -484,7 +496,7 @@ async def get_properties(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -507,7 +519,6 @@ async def get_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -521,7 +532,7 @@ async def get_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -632,7 +643,7 @@ async def update(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -666,7 +677,6 @@ async def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -680,7 +690,7 @@ async def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -703,7 +713,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.StorageAccount"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-05-01"))
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -720,7 +730,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -736,7 +745,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -786,7 +794,7 @@ def list_by_resource_group(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-05-01"))
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -804,7 +812,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -820,7 +827,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -870,7 +876,7 @@ async def list_keys(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.StorageAccountListKeysResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -893,7 +899,6 @@ async def list_keys(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -907,7 +912,7 @@ async def list_keys(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response)
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1001,7 +1006,7 @@ async def regenerate_key(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.StorageAccountListKeysResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1035,7 +1040,6 @@ async def regenerate_key(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1049,7 +1053,7 @@ async def regenerate_key(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response)
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1140,7 +1144,7 @@ async def list_account_sas(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.ListAccountSasResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1174,7 +1178,6 @@ async def list_account_sas(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1188,7 +1191,7 @@ async def list_account_sas(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListAccountSasResponse", pipeline_response)
+        deserialized = self._deserialize("ListAccountSasResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1277,7 +1280,7 @@ async def list_service_sas(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.ListServiceSasResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1311,7 +1314,6 @@ async def list_service_sas(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1325,17 +1327,17 @@ async def list_service_sas(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListServiceSasResponse", pipeline_response)
+        deserialized = self._deserialize("ListServiceSasResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
 
         return deserialized  # type: ignore
 
-    async def _failover_initial(  # pylint: disable=inconsistent-return-statements
+    async def _failover_initial(
         self, resource_group_name: str, account_name: str, failover_type: Literal["Planned"] = "Planned", **kwargs: Any
-    ) -> None:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1347,7 +1349,7 @@ async def _failover_initial(  # pylint: disable=inconsistent-return-statements
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-05-01"))
-        cls: ClsType[None] = kwargs.pop("cls", None)
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
 
         _request = build_failover_request(
             resource_group_name=resource_group_name,
@@ -1358,10 +1360,10 @@ async def _failover_initial(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -1369,11 +1371,19 @@ async def _failover_initial(  # pylint: disable=inconsistent-return-statements
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
-            return cls(pipeline_response, None, {})  # type: ignore
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
 
     @distributed_trace_async
     async def begin_failover(
@@ -1414,7 +1424,7 @@ async def begin_failover(
         lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
         cont_token: Optional[str] = kwargs.pop("continuation_token", None)
         if cont_token is None:
-            raw_result = await self._failover_initial(  # type: ignore
+            raw_result = await self._failover_initial(
                 resource_group_name=resource_group_name,
                 account_name=account_name,
                 failover_type=failover_type,
@@ -1424,6 +1434,7 @@ async def begin_failover(
                 params=_params,
                 **kwargs
             )
+            await raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
@@ -1447,10 +1458,10 @@ def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-
             )
         return AsyncLROPoller[None](self._client, raw_result, get_long_running_output, polling_method)  # type: ignore
 
-    async def _hierarchical_namespace_migration_initial(  # pylint: disable=inconsistent-return-statements,name-too-long
+    async def _hierarchical_namespace_migration_initial(  # pylint: disable=name-too-long
         self, resource_group_name: str, account_name: str, request_type: str, **kwargs: Any
-    ) -> None:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1462,7 +1473,7 @@ async def _hierarchical_namespace_migration_initial(  # pylint: disable=inconsis
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-05-01"))
-        cls: ClsType[None] = kwargs.pop("cls", None)
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
 
         _request = build_hierarchical_namespace_migration_request(
             resource_group_name=resource_group_name,
@@ -1473,10 +1484,10 @@ async def _hierarchical_namespace_migration_initial(  # pylint: disable=inconsis
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -1484,12 +1495,20 @@ async def _hierarchical_namespace_migration_initial(  # pylint: disable=inconsis
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
-            return cls(pipeline_response, None, {})  # type: ignore
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
 
     @distributed_trace_async
     async def begin_hierarchical_namespace_migration(
@@ -1522,7 +1541,7 @@ async def begin_hierarchical_namespace_migration(
         lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
         cont_token: Optional[str] = kwargs.pop("continuation_token", None)
         if cont_token is None:
-            raw_result = await self._hierarchical_namespace_migration_initial(  # type: ignore
+            raw_result = await self._hierarchical_namespace_migration_initial(
                 resource_group_name=resource_group_name,
                 account_name=account_name,
                 request_type=request_type,
@@ -1532,6 +1551,7 @@ async def begin_hierarchical_namespace_migration(
                 params=_params,
                 **kwargs
             )
+            await raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
@@ -1555,10 +1575,10 @@ def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-
             )
         return AsyncLROPoller[None](self._client, raw_result, get_long_running_output, polling_method)  # type: ignore
 
-    async def _abort_hierarchical_namespace_migration_initial(  # pylint: disable=inconsistent-return-statements,name-too-long
+    async def _abort_hierarchical_namespace_migration_initial(  # pylint: disable=name-too-long
         self, resource_group_name: str, account_name: str, **kwargs: Any
-    ) -> None:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1570,7 +1590,7 @@ async def _abort_hierarchical_namespace_migration_initial(  # pylint: disable=in
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-05-01"))
-        cls: ClsType[None] = kwargs.pop("cls", None)
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
 
         _request = build_abort_hierarchical_namespace_migration_request(
             resource_group_name=resource_group_name,
@@ -1580,10 +1600,10 @@ async def _abort_hierarchical_namespace_migration_initial(  # pylint: disable=in
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -1591,12 +1611,20 @@ async def _abort_hierarchical_namespace_migration_initial(  # pylint: disable=in
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
-            return cls(pipeline_response, None, {})  # type: ignore
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
 
     @distributed_trace_async
     async def begin_abort_hierarchical_namespace_migration(  # pylint: disable=name-too-long
@@ -1624,7 +1652,7 @@ async def begin_abort_hierarchical_namespace_migration(  # pylint: disable=name-
         lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
         cont_token: Optional[str] = kwargs.pop("continuation_token", None)
         if cont_token is None:
-            raw_result = await self._abort_hierarchical_namespace_migration_initial(  # type: ignore
+            raw_result = await self._abort_hierarchical_namespace_migration_initial(
                 resource_group_name=resource_group_name,
                 account_name=account_name,
                 api_version=api_version,
@@ -1633,6 +1661,7 @@ async def begin_abort_hierarchical_namespace_migration(  # pylint: disable=name-
                 params=_params,
                 **kwargs
             )
+            await raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
@@ -1656,14 +1685,14 @@ def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-
             )
         return AsyncLROPoller[None](self._client, raw_result, get_long_running_output, polling_method)  # type: ignore
 
-    async def _customer_initiated_migration_initial(  # pylint: disable=inconsistent-return-statements
+    async def _customer_initiated_migration_initial(
         self,
         resource_group_name: str,
         account_name: str,
         parameters: Union[_models.StorageAccountMigration, IO[bytes]],
         **kwargs: Any
-    ) -> None:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1676,7 +1705,7 @@ async def _customer_initiated_migration_initial(  # pylint: disable=inconsistent
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-05-01"))
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
-        cls: ClsType[None] = kwargs.pop("cls", None)
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
         _json = None
@@ -1697,10 +1726,10 @@ async def _customer_initiated_migration_initial(  # pylint: disable=inconsistent
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -1708,6 +1737,10 @@ async def _customer_initiated_migration_initial(  # pylint: disable=inconsistent
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponseAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
@@ -1716,8 +1749,12 @@ async def _customer_initiated_migration_initial(  # pylint: disable=inconsistent
         if response.status_code == 202:
             response_headers["Location"] = self._deserialize("str", response.headers.get("Location"))
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
-            return cls(pipeline_response, None, response_headers)  # type: ignore
+            return cls(pipeline_response, deserialized, response_headers)  # type: ignore
+
+        return deserialized  # type: ignore
 
     @overload
     async def begin_customer_initiated_migration(
@@ -1825,7 +1862,7 @@ async def begin_customer_initiated_migration(
         lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
         cont_token: Optional[str] = kwargs.pop("continuation_token", None)
         if cont_token is None:
-            raw_result = await self._customer_initiated_migration_initial(  # type: ignore
+            raw_result = await self._customer_initiated_migration_initial(
                 resource_group_name=resource_group_name,
                 account_name=account_name,
                 parameters=parameters,
@@ -1836,6 +1873,7 @@ async def begin_customer_initiated_migration(
                 params=_params,
                 **kwargs
             )
+            await raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
@@ -1883,7 +1921,7 @@ async def get_customer_initiated_migration(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.StorageAccountMigration
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1906,7 +1944,6 @@ async def get_customer_initiated_migration(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1921,7 +1958,7 @@ async def get_customer_initiated_migration(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponseAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountMigration", pipeline_response)
+        deserialized = self._deserialize("StorageAccountMigration", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1934,8 +1971,8 @@ async def _restore_blob_ranges_initial(
         account_name: str,
         parameters: Union[_models.BlobRestoreParameters, IO[bytes]],
         **kwargs: Any
-    ) -> _models.BlobRestoreStatus:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1948,7 +1985,7 @@ async def _restore_blob_ranges_initial(
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-05-01"))
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
-        cls: ClsType[_models.BlobRestoreStatus] = kwargs.pop("cls", None)
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
         _json = None
@@ -1969,10 +2006,10 @@ async def _restore_blob_ranges_initial(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -1980,14 +2017,14 @@ async def _restore_blob_ranges_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response)
-
-        if response.status_code == 202:
-            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response)
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -2103,10 +2140,11 @@ async def begin_restore_blob_ranges(
                 params=_params,
                 **kwargs
             )
+            await raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):
-            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response)
+            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response.http_response)
             if cls:
                 return cls(pipeline_response, deserialized, {})  # type: ignore
             return deserialized
@@ -2131,9 +2169,7 @@ def get_long_running_output(pipeline_response):
         )
 
     @distributed_trace_async
-    async def revoke_user_delegation_keys(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, **kwargs: Any
-    ) -> None:
+    async def revoke_user_delegation_keys(self, resource_group_name: str, account_name: str, **kwargs: Any) -> None:
         """Revoke user delegation keys.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -2147,7 +2183,7 @@ async def revoke_user_delegation_keys(  # pylint: disable=inconsistent-return-st
         :rtype: None
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -2169,7 +2205,6 @@ async def revoke_user_delegation_keys(  # pylint: disable=inconsistent-return-st
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_storage_task_assignment_instances_report_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_storage_task_assignment_instances_report_operations.py
index 8a52e7d314cc..8338be3708fd 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_storage_task_assignment_instances_report_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_storage_task_assignment_instances_report_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
@@ -20,20 +19,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._storage_task_assignment_instances_report_operations import build_list_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
 
@@ -68,6 +65,7 @@ def list(
         filter: Optional[str] = None,
         **kwargs: Any
     ) -> AsyncIterable["_models.StorageTaskReportInstance"]:
+        # pylint: disable=line-too-long
         """Fetch the report summary of a single storage task assignment's instances.
 
         :param resource_group_name: The name of the resource group. The name is case insensitive.
@@ -101,7 +99,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-05-01"))
         cls: ClsType[_models.StorageTaskReportSummary] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -123,7 +121,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -139,7 +136,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_storage_task_assignments_instances_report_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_storage_task_assignments_instances_report_operations.py
index 14344be4fdd5..b2e92ba6d702 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_storage_task_assignments_instances_report_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_storage_task_assignments_instances_report_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
@@ -20,20 +19,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._storage_task_assignments_instances_report_operations import build_list_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
 
@@ -67,6 +64,7 @@ def list(
         filter: Optional[str] = None,
         **kwargs: Any
     ) -> AsyncIterable["_models.StorageTaskReportInstance"]:
+        # pylint: disable=line-too-long
         """Fetch the report summary of all the storage task assignments and instances in an account.
 
         :param resource_group_name: The name of the resource group. The name is case insensitive.
@@ -96,7 +94,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-05-01"))
         cls: ClsType[_models.StorageTaskReportSummary] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -117,7 +115,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -133,7 +130,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_storage_task_assignments_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_storage_task_assignments_operations.py
index 68e89fd42d72..6d5c7bf6dd71 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_storage_task_assignments_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_storage_task_assignments_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, 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
@@ -18,12 +17,13 @@
     ResourceExistsError,
     ResourceNotFoundError,
     ResourceNotModifiedError,
+    StreamClosedError,
+    StreamConsumedError,
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
 from azure.core.polling import AsyncLROPoller, AsyncNoPolling, AsyncPollingMethod
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
@@ -31,7 +31,6 @@
 from azure.mgmt.core.polling.async_arm_polling import AsyncARMPolling
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._storage_task_assignments_operations import (
     build_create_request,
     build_delete_request,
@@ -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]]
 
@@ -75,8 +74,8 @@ async def _create_initial(
         storage_task_assignment_name: str,
         parameters: Union[_models.StorageTaskAssignment, IO[bytes]],
         **kwargs: Any
-    ) -> Optional[_models.StorageTaskAssignment]:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -89,7 +88,7 @@ async def _create_initial(
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-05-01"))
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
-        cls: ClsType[Optional[_models.StorageTaskAssignment]] = kwargs.pop("cls", None)
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
         _json = None
@@ -111,10 +110,10 @@ async def _create_initial(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -122,21 +121,20 @@ async def _create_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 201, 202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponseAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = None
         response_headers = {}
-        if response.status_code == 200:
-            deserialized = self._deserialize("StorageTaskAssignment", pipeline_response)
-
-        if response.status_code == 201:
-            deserialized = self._deserialize("StorageTaskAssignment", pipeline_response)
-
         if response.status_code == 202:
             response_headers["Location"] = self._deserialize("str", response.headers.get("Location"))
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
 
@@ -279,10 +277,11 @@ async def begin_create(
                 params=_params,
                 **kwargs
             )
+            await raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):
-            deserialized = self._deserialize("StorageTaskAssignment", pipeline_response)
+            deserialized = self._deserialize("StorageTaskAssignment", pipeline_response.http_response)
             if cls:
                 return cls(pipeline_response, deserialized, {})  # type: ignore
             return deserialized
@@ -313,8 +312,8 @@ async def _update_initial(
         storage_task_assignment_name: str,
         parameters: Union[_models.StorageTaskAssignmentUpdateParameters, IO[bytes]],
         **kwargs: Any
-    ) -> Optional[_models.StorageTaskAssignment]:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -327,7 +326,7 @@ async def _update_initial(
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-05-01"))
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
-        cls: ClsType[Optional[_models.StorageTaskAssignment]] = kwargs.pop("cls", None)
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
         _json = None
@@ -349,10 +348,10 @@ async def _update_initial(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -360,18 +359,20 @@ async def _update_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponseAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = None
         response_headers = {}
-        if response.status_code == 200:
-            deserialized = self._deserialize("StorageTaskAssignment", pipeline_response)
-
         if response.status_code == 202:
             response_headers["Location"] = self._deserialize("str", response.headers.get("Location"))
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
 
@@ -503,10 +504,11 @@ async def begin_update(
                 params=_params,
                 **kwargs
             )
+            await raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):
-            deserialized = self._deserialize("StorageTaskAssignment", pipeline_response)
+            deserialized = self._deserialize("StorageTaskAssignment", pipeline_response.http_response)
             if cls:
                 return cls(pipeline_response, deserialized, {})  # type: ignore
             return deserialized
@@ -551,7 +553,7 @@ async def get(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.StorageTaskAssignment
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -574,7 +576,6 @@ async def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -589,17 +590,17 @@ async def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponseAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageTaskAssignment", pipeline_response)
+        deserialized = self._deserialize("StorageTaskAssignment", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
 
         return deserialized  # type: ignore
 
-    async def _delete_initial(  # pylint: disable=inconsistent-return-statements
+    async def _delete_initial(
         self, resource_group_name: str, account_name: str, storage_task_assignment_name: str, **kwargs: Any
-    ) -> None:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -611,7 +612,7 @@ async def _delete_initial(  # pylint: disable=inconsistent-return-statements
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-05-01"))
-        cls: ClsType[None] = kwargs.pop("cls", None)
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
 
         _request = build_delete_request(
             resource_group_name=resource_group_name,
@@ -622,10 +623,10 @@ async def _delete_initial(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -633,6 +634,10 @@ async def _delete_initial(  # pylint: disable=inconsistent-return-statements
         response = pipeline_response.http_response
 
         if response.status_code not in [202, 204]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponseAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
@@ -641,8 +646,12 @@ async def _delete_initial(  # pylint: disable=inconsistent-return-statements
         if response.status_code == 202:
             response_headers["Location"] = self._deserialize("str", response.headers.get("Location"))
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
-            return cls(pipeline_response, None, response_headers)  # type: ignore
+            return cls(pipeline_response, deserialized, response_headers)  # type: ignore
+
+        return deserialized  # type: ignore
 
     @distributed_trace_async
     async def begin_delete(
@@ -674,7 +683,7 @@ async def begin_delete(
         lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
         cont_token: Optional[str] = kwargs.pop("continuation_token", None)
         if cont_token is None:
-            raw_result = await self._delete_initial(  # type: ignore
+            raw_result = await self._delete_initial(
                 resource_group_name=resource_group_name,
                 account_name=account_name,
                 storage_task_assignment_name=storage_task_assignment_name,
@@ -684,6 +693,7 @@ async def begin_delete(
                 params=_params,
                 **kwargs
             )
+            await raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
@@ -735,7 +745,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-05-01"))
         cls: ClsType[_models.StorageTaskAssignmentsList] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -755,7 +765,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -771,7 +780,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_table_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_table_operations.py
index 5a7587e7a961..0cbc2da1955f 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_table_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_table_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
@@ -21,15 +20,13 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._table_operations import (
     build_create_request,
     build_delete_request,
@@ -41,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]]
 
@@ -163,7 +160,7 @@ async def create(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.Table
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -201,7 +198,6 @@ async def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -215,7 +211,7 @@ async def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("Table", pipeline_response)
+        deserialized = self._deserialize("Table", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -319,7 +315,7 @@ async def update(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.Table
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -357,7 +353,6 @@ async def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -371,7 +366,7 @@ async def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("Table", pipeline_response)
+        deserialized = self._deserialize("Table", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -397,7 +392,7 @@ async def get(self, resource_group_name: str, account_name: str, table_name: str
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.Table
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -420,7 +415,6 @@ async def get(self, resource_group_name: str, account_name: str, table_name: str
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -434,7 +428,7 @@ async def get(self, resource_group_name: str, account_name: str, table_name: str
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("Table", pipeline_response)
+        deserialized = self._deserialize("Table", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -442,9 +436,7 @@ async def get(self, resource_group_name: str, account_name: str, table_name: str
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def delete(  # pylint: disable=inconsistent-return-statements
-        self, resource_group_name: str, account_name: str, table_name: str, **kwargs: Any
-    ) -> None:
+    async def delete(self, resource_group_name: str, account_name: str, table_name: str, **kwargs: Any) -> None:
         """Deletes the table with the specified table name, under the specified account if it exists.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
@@ -462,7 +454,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,
@@ -485,7 +477,6 @@ async def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -523,7 +514,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> As
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-05-01"))
         cls: ClsType[_models.ListTableResource] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -542,7 +533,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -558,7 +548,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_table_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_table_services_operations.py
index 3f74a2488877..5b5a4673c2ed 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_table_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_table_services_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, Literal, Optional, Type, TypeVar, Union, overload
+from typing import Any, Callable, Dict, IO, Literal, Optional, TypeVar, Union, overload
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -19,14 +18,12 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._table_services_operations import (
     build_get_service_properties_request,
     build_list_request,
@@ -36,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]]
 
@@ -76,7 +73,7 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.ListTableServices
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -98,7 +95,6 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -112,7 +108,7 @@ async def list(self, resource_group_name: str, account_name: str, **kwargs: Any)
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListTableServices", pipeline_response)
+        deserialized = self._deserialize("ListTableServices", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -207,7 +203,7 @@ async def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.TableServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -243,7 +239,6 @@ async def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -257,7 +252,7 @@ async def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("TableServiceProperties", pipeline_response)
+        deserialized = self._deserialize("TableServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -282,7 +277,7 @@ async def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.TableServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -306,7 +301,6 @@ async def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -320,7 +314,7 @@ async def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("TableServiceProperties", pipeline_response)
+        deserialized = self._deserialize("TableServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_usages_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_usages_operations.py
index 2cfe1b9f0a65..6ca63d8f0c8f 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_usages_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/aio/operations/_usages_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
@@ -20,20 +19,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import AsyncHttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import AsyncHttpResponse, HttpRequest
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from ... import models as _models
-from ..._vendor import _convert_request
 from ...operations._usages_operations import build_list_by_location_request
 
 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 +72,7 @@ def list_by_location(self, location: str, **kwargs: Any) -> AsyncIterable["_mode
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-05-01"))
         cls: ClsType[_models.UsageListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -93,7 +90,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -109,7 +105,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/models/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/models/__init__.py
index 32d458c161b4..46195c06af2b 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/models/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/models/__init__.py
@@ -5,270 +5,281 @@
 # 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 AccessPolicy
-from ._models_py3 import AccountImmutabilityPolicyProperties
-from ._models_py3 import AccountSasParameters
-from ._models_py3 import ActiveDirectoryProperties
-from ._models_py3 import AzureEntityResource
-from ._models_py3 import AzureFilesIdentityBasedAuthentication
-from ._models_py3 import BlobContainer
-from ._models_py3 import BlobInventoryCreationTime
-from ._models_py3 import BlobInventoryPolicy
-from ._models_py3 import BlobInventoryPolicyDefinition
-from ._models_py3 import BlobInventoryPolicyFilter
-from ._models_py3 import BlobInventoryPolicyRule
-from ._models_py3 import BlobInventoryPolicySchema
-from ._models_py3 import BlobRestoreParameters
-from ._models_py3 import BlobRestoreRange
-from ._models_py3 import BlobRestoreStatus
-from ._models_py3 import BlobServiceItems
-from ._models_py3 import BlobServiceProperties
-from ._models_py3 import ChangeFeed
-from ._models_py3 import CheckNameAvailabilityResult
-from ._models_py3 import CloudErrorBody
-from ._models_py3 import CorsRule
-from ._models_py3 import CorsRules
-from ._models_py3 import CustomDomain
-from ._models_py3 import DateAfterCreation
-from ._models_py3 import DateAfterModification
-from ._models_py3 import DeleteRetentionPolicy
-from ._models_py3 import DeletedAccount
-from ._models_py3 import DeletedAccountListResult
-from ._models_py3 import DeletedShare
-from ._models_py3 import Dimension
-from ._models_py3 import Encryption
-from ._models_py3 import EncryptionIdentity
-from ._models_py3 import EncryptionScope
-from ._models_py3 import EncryptionScopeKeyVaultProperties
-from ._models_py3 import EncryptionScopeListResult
-from ._models_py3 import EncryptionService
-from ._models_py3 import EncryptionServices
-from ._models_py3 import Endpoints
-from ._models_py3 import ErrorAdditionalInfo
-from ._models_py3 import ErrorDetail
-from ._models_py3 import ErrorResponse
-from ._models_py3 import ErrorResponseAutoGenerated
-from ._models_py3 import ErrorResponseBody
-from ._models_py3 import ExecutionTarget
-from ._models_py3 import ExecutionTrigger
-from ._models_py3 import ExecutionTriggerUpdate
-from ._models_py3 import ExtendedLocation
-from ._models_py3 import FileServiceItems
-from ._models_py3 import FileServiceProperties
-from ._models_py3 import FileShare
-from ._models_py3 import FileShareItem
-from ._models_py3 import FileShareItems
-from ._models_py3 import GeoReplicationStats
-from ._models_py3 import IPRule
-from ._models_py3 import Identity
-from ._models_py3 import ImmutabilityPolicy
-from ._models_py3 import ImmutabilityPolicyProperties
-from ._models_py3 import ImmutableStorageAccount
-from ._models_py3 import ImmutableStorageWithVersioning
-from ._models_py3 import KeyCreationTime
-from ._models_py3 import KeyPolicy
-from ._models_py3 import KeyVaultProperties
-from ._models_py3 import LastAccessTimeTrackingPolicy
-from ._models_py3 import LeaseContainerRequest
-from ._models_py3 import LeaseContainerResponse
-from ._models_py3 import LeaseShareRequest
-from ._models_py3 import LeaseShareResponse
-from ._models_py3 import LegalHold
-from ._models_py3 import LegalHoldProperties
-from ._models_py3 import ListAccountSasResponse
-from ._models_py3 import ListBlobInventoryPolicy
-from ._models_py3 import ListContainerItem
-from ._models_py3 import ListContainerItems
-from ._models_py3 import ListQueue
-from ._models_py3 import ListQueueResource
-from ._models_py3 import ListQueueServices
-from ._models_py3 import ListServiceSasResponse
-from ._models_py3 import ListTableResource
-from ._models_py3 import ListTableServices
-from ._models_py3 import LocalUser
-from ._models_py3 import LocalUserKeys
-from ._models_py3 import LocalUserRegeneratePasswordResult
-from ._models_py3 import LocalUsers
-from ._models_py3 import ManagementPolicy
-from ._models_py3 import ManagementPolicyAction
-from ._models_py3 import ManagementPolicyBaseBlob
-from ._models_py3 import ManagementPolicyDefinition
-from ._models_py3 import ManagementPolicyFilter
-from ._models_py3 import ManagementPolicyRule
-from ._models_py3 import ManagementPolicySchema
-from ._models_py3 import ManagementPolicySnapShot
-from ._models_py3 import ManagementPolicyVersion
-from ._models_py3 import MetricSpecification
-from ._models_py3 import Multichannel
-from ._models_py3 import NetworkRuleSet
-from ._models_py3 import NetworkSecurityPerimeter
-from ._models_py3 import NetworkSecurityPerimeterConfiguration
-from ._models_py3 import NetworkSecurityPerimeterConfigurationList
-from ._models_py3 import NetworkSecurityPerimeterConfigurationPropertiesProfile
-from ._models_py3 import NetworkSecurityPerimeterConfigurationPropertiesResourceAssociation
-from ._models_py3 import NspAccessRule
-from ._models_py3 import NspAccessRuleProperties
-from ._models_py3 import NspAccessRulePropertiesSubscriptionsItem
-from ._models_py3 import ObjectReplicationPolicies
-from ._models_py3 import ObjectReplicationPolicy
-from ._models_py3 import ObjectReplicationPolicyFilter
-from ._models_py3 import ObjectReplicationPolicyRule
-from ._models_py3 import Operation
-from ._models_py3 import OperationDisplay
-from ._models_py3 import OperationListResult
-from ._models_py3 import PermissionScope
-from ._models_py3 import PrivateEndpoint
-from ._models_py3 import PrivateEndpointConnection
-from ._models_py3 import PrivateEndpointConnectionListResult
-from ._models_py3 import PrivateLinkResource
-from ._models_py3 import PrivateLinkResourceListResult
-from ._models_py3 import PrivateLinkServiceConnectionState
-from ._models_py3 import ProtectedAppendWritesHistory
-from ._models_py3 import ProtocolSettings
-from ._models_py3 import ProvisioningIssue
-from ._models_py3 import ProvisioningIssueProperties
-from ._models_py3 import ProxyResource
-from ._models_py3 import ProxyResourceAutoGenerated
-from ._models_py3 import QueueServiceProperties
-from ._models_py3 import Resource
-from ._models_py3 import ResourceAccessRule
-from ._models_py3 import ResourceAutoGenerated
-from ._models_py3 import RestorePolicyProperties
-from ._models_py3 import Restriction
-from ._models_py3 import RoutingPreference
-from ._models_py3 import SKUCapability
-from ._models_py3 import SasPolicy
-from ._models_py3 import ServiceSasParameters
-from ._models_py3 import ServiceSpecification
-from ._models_py3 import SignedIdentifier
-from ._models_py3 import Sku
-from ._models_py3 import SkuInformation
-from ._models_py3 import SmbSetting
-from ._models_py3 import SshPublicKey
-from ._models_py3 import StorageAccount
-from ._models_py3 import StorageAccountCheckNameAvailabilityParameters
-from ._models_py3 import StorageAccountCreateParameters
-from ._models_py3 import StorageAccountInternetEndpoints
-from ._models_py3 import StorageAccountKey
-from ._models_py3 import StorageAccountListKeysResult
-from ._models_py3 import StorageAccountListResult
-from ._models_py3 import StorageAccountMicrosoftEndpoints
-from ._models_py3 import StorageAccountMigration
-from ._models_py3 import StorageAccountRegenerateKeyParameters
-from ._models_py3 import StorageAccountSkuConversionStatus
-from ._models_py3 import StorageAccountUpdateParameters
-from ._models_py3 import StorageQueue
-from ._models_py3 import StorageSkuListResult
-from ._models_py3 import StorageTaskAssignment
-from ._models_py3 import StorageTaskAssignmentExecutionContext
-from ._models_py3 import StorageTaskAssignmentProperties
-from ._models_py3 import StorageTaskAssignmentReport
-from ._models_py3 import StorageTaskAssignmentUpdateExecutionContext
-from ._models_py3 import StorageTaskAssignmentUpdateParameters
-from ._models_py3 import StorageTaskAssignmentUpdateProperties
-from ._models_py3 import StorageTaskAssignmentUpdateReport
-from ._models_py3 import StorageTaskAssignmentsList
-from ._models_py3 import StorageTaskReportInstance
-from ._models_py3 import StorageTaskReportProperties
-from ._models_py3 import StorageTaskReportSummary
-from ._models_py3 import SystemData
-from ._models_py3 import Table
-from ._models_py3 import TableAccessPolicy
-from ._models_py3 import TableServiceProperties
-from ._models_py3 import TableSignedIdentifier
-from ._models_py3 import TagFilter
-from ._models_py3 import TagProperty
-from ._models_py3 import TrackedResource
-from ._models_py3 import TriggerParameters
-from ._models_py3 import TriggerParametersUpdate
-from ._models_py3 import UpdateHistoryProperty
-from ._models_py3 import Usage
-from ._models_py3 import UsageListResult
-from ._models_py3 import UsageName
-from ._models_py3 import UserAssignedIdentity
-from ._models_py3 import VirtualNetworkRule
+from typing import TYPE_CHECKING
 
-from ._storage_management_client_enums import AccessTier
-from ._storage_management_client_enums import AccountImmutabilityPolicyState
-from ._storage_management_client_enums import AccountStatus
-from ._storage_management_client_enums import AccountType
-from ._storage_management_client_enums import AllowedCopyScope
-from ._storage_management_client_enums import AllowedMethods
-from ._storage_management_client_enums import BlobInventoryPolicyName
-from ._storage_management_client_enums import BlobRestoreProgressStatus
-from ._storage_management_client_enums import Bypass
-from ._storage_management_client_enums import CreatedByType
-from ._storage_management_client_enums import DefaultAction
-from ._storage_management_client_enums import DefaultSharePermission
-from ._storage_management_client_enums import DirectoryServiceOptions
-from ._storage_management_client_enums import DnsEndpointType
-from ._storage_management_client_enums import EnabledProtocols
-from ._storage_management_client_enums import EncryptionScopeSource
-from ._storage_management_client_enums import EncryptionScopeState
-from ._storage_management_client_enums import ExpirationAction
-from ._storage_management_client_enums import ExtendedLocationTypes
-from ._storage_management_client_enums import Format
-from ._storage_management_client_enums import GeoReplicationStatus
-from ._storage_management_client_enums import HttpProtocol
-from ._storage_management_client_enums import IdentityType
-from ._storage_management_client_enums import ImmutabilityPolicyState
-from ._storage_management_client_enums import ImmutabilityPolicyUpdateType
-from ._storage_management_client_enums import InventoryRuleType
-from ._storage_management_client_enums import IssueType
-from ._storage_management_client_enums import KeyPermission
-from ._storage_management_client_enums import KeySource
-from ._storage_management_client_enums import KeyType
-from ._storage_management_client_enums import Kind
-from ._storage_management_client_enums import LargeFileSharesState
-from ._storage_management_client_enums import LeaseContainerRequestEnum
-from ._storage_management_client_enums import LeaseDuration
-from ._storage_management_client_enums import LeaseShareAction
-from ._storage_management_client_enums import LeaseState
-from ._storage_management_client_enums import LeaseStatus
-from ._storage_management_client_enums import ListContainersInclude
-from ._storage_management_client_enums import ListEncryptionScopesInclude
-from ._storage_management_client_enums import ListLocalUserIncludeParam
-from ._storage_management_client_enums import ManagementPolicyName
-from ._storage_management_client_enums import MigrationName
-from ._storage_management_client_enums import MigrationState
-from ._storage_management_client_enums import MigrationStatus
-from ._storage_management_client_enums import MinimumTlsVersion
-from ._storage_management_client_enums import Name
-from ._storage_management_client_enums import NetworkSecurityPerimeterConfigurationProvisioningState
-from ._storage_management_client_enums import NspAccessRuleDirection
-from ._storage_management_client_enums import ObjectType
-from ._storage_management_client_enums import Permissions
-from ._storage_management_client_enums import PostFailoverRedundancy
-from ._storage_management_client_enums import PostPlannedFailoverRedundancy
-from ._storage_management_client_enums import PrivateEndpointConnectionProvisioningState
-from ._storage_management_client_enums import PrivateEndpointServiceConnectionStatus
-from ._storage_management_client_enums import ProvisioningState
-from ._storage_management_client_enums import PublicAccess
-from ._storage_management_client_enums import PublicNetworkAccess
-from ._storage_management_client_enums import Reason
-from ._storage_management_client_enums import ReasonCode
-from ._storage_management_client_enums import ResourceAssociationAccessMode
-from ._storage_management_client_enums import RootSquashType
-from ._storage_management_client_enums import RoutingChoice
-from ._storage_management_client_enums import RuleType
-from ._storage_management_client_enums import RunResult
-from ._storage_management_client_enums import RunStatusEnum
-from ._storage_management_client_enums import Schedule
-from ._storage_management_client_enums import Services
-from ._storage_management_client_enums import Severity
-from ._storage_management_client_enums import ShareAccessTier
-from ._storage_management_client_enums import SignedResource
-from ._storage_management_client_enums import SignedResourceTypes
-from ._storage_management_client_enums import SkuConversionStatus
-from ._storage_management_client_enums import SkuName
-from ._storage_management_client_enums import SkuTier
-from ._storage_management_client_enums import State
-from ._storage_management_client_enums import StorageAccountExpand
-from ._storage_management_client_enums import TriggerType
-from ._storage_management_client_enums import UsageUnit
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+
+from ._models_py3 import (  # type: ignore
+    AccessPolicy,
+    AccountImmutabilityPolicyProperties,
+    AccountSasParameters,
+    ActiveDirectoryProperties,
+    AzureEntityResource,
+    AzureFilesIdentityBasedAuthentication,
+    BlobContainer,
+    BlobInventoryCreationTime,
+    BlobInventoryPolicy,
+    BlobInventoryPolicyDefinition,
+    BlobInventoryPolicyFilter,
+    BlobInventoryPolicyRule,
+    BlobInventoryPolicySchema,
+    BlobRestoreParameters,
+    BlobRestoreRange,
+    BlobRestoreStatus,
+    BlobServiceItems,
+    BlobServiceProperties,
+    ChangeFeed,
+    CheckNameAvailabilityResult,
+    CloudErrorBody,
+    CorsRule,
+    CorsRules,
+    CustomDomain,
+    DateAfterCreation,
+    DateAfterModification,
+    DeleteRetentionPolicy,
+    DeletedAccount,
+    DeletedAccountListResult,
+    DeletedShare,
+    Dimension,
+    Encryption,
+    EncryptionIdentity,
+    EncryptionScope,
+    EncryptionScopeKeyVaultProperties,
+    EncryptionScopeListResult,
+    EncryptionService,
+    EncryptionServices,
+    Endpoints,
+    ErrorAdditionalInfo,
+    ErrorDetail,
+    ErrorResponse,
+    ErrorResponseAutoGenerated,
+    ErrorResponseBody,
+    ExecutionTarget,
+    ExecutionTrigger,
+    ExecutionTriggerUpdate,
+    ExtendedLocation,
+    FileServiceItems,
+    FileServiceProperties,
+    FileShare,
+    FileShareItem,
+    FileShareItems,
+    GeoReplicationStats,
+    IPRule,
+    Identity,
+    ImmutabilityPolicy,
+    ImmutabilityPolicyProperties,
+    ImmutableStorageAccount,
+    ImmutableStorageWithVersioning,
+    KeyCreationTime,
+    KeyPolicy,
+    KeyVaultProperties,
+    LastAccessTimeTrackingPolicy,
+    LeaseContainerRequest,
+    LeaseContainerResponse,
+    LeaseShareRequest,
+    LeaseShareResponse,
+    LegalHold,
+    LegalHoldProperties,
+    ListAccountSasResponse,
+    ListBlobInventoryPolicy,
+    ListContainerItem,
+    ListContainerItems,
+    ListQueue,
+    ListQueueResource,
+    ListQueueServices,
+    ListServiceSasResponse,
+    ListTableResource,
+    ListTableServices,
+    LocalUser,
+    LocalUserKeys,
+    LocalUserRegeneratePasswordResult,
+    LocalUsers,
+    ManagementPolicy,
+    ManagementPolicyAction,
+    ManagementPolicyBaseBlob,
+    ManagementPolicyDefinition,
+    ManagementPolicyFilter,
+    ManagementPolicyRule,
+    ManagementPolicySchema,
+    ManagementPolicySnapShot,
+    ManagementPolicyVersion,
+    MetricSpecification,
+    Multichannel,
+    NetworkRuleSet,
+    NetworkSecurityPerimeter,
+    NetworkSecurityPerimeterConfiguration,
+    NetworkSecurityPerimeterConfigurationList,
+    NetworkSecurityPerimeterConfigurationPropertiesProfile,
+    NetworkSecurityPerimeterConfigurationPropertiesResourceAssociation,
+    NspAccessRule,
+    NspAccessRuleProperties,
+    NspAccessRulePropertiesSubscriptionsItem,
+    ObjectReplicationPolicies,
+    ObjectReplicationPolicy,
+    ObjectReplicationPolicyFilter,
+    ObjectReplicationPolicyRule,
+    Operation,
+    OperationDisplay,
+    OperationListResult,
+    PermissionScope,
+    PrivateEndpoint,
+    PrivateEndpointConnection,
+    PrivateEndpointConnectionListResult,
+    PrivateLinkResource,
+    PrivateLinkResourceListResult,
+    PrivateLinkServiceConnectionState,
+    ProtectedAppendWritesHistory,
+    ProtocolSettings,
+    ProvisioningIssue,
+    ProvisioningIssueProperties,
+    ProxyResource,
+    ProxyResourceAutoGenerated,
+    QueueServiceProperties,
+    Resource,
+    ResourceAccessRule,
+    ResourceAutoGenerated,
+    RestorePolicyProperties,
+    Restriction,
+    RoutingPreference,
+    SKUCapability,
+    SasPolicy,
+    ServiceSasParameters,
+    ServiceSpecification,
+    SignedIdentifier,
+    Sku,
+    SkuInformation,
+    SmbSetting,
+    SshPublicKey,
+    StorageAccount,
+    StorageAccountCheckNameAvailabilityParameters,
+    StorageAccountCreateParameters,
+    StorageAccountInternetEndpoints,
+    StorageAccountKey,
+    StorageAccountListKeysResult,
+    StorageAccountListResult,
+    StorageAccountMicrosoftEndpoints,
+    StorageAccountMigration,
+    StorageAccountRegenerateKeyParameters,
+    StorageAccountSkuConversionStatus,
+    StorageAccountUpdateParameters,
+    StorageQueue,
+    StorageSkuListResult,
+    StorageTaskAssignment,
+    StorageTaskAssignmentExecutionContext,
+    StorageTaskAssignmentProperties,
+    StorageTaskAssignmentReport,
+    StorageTaskAssignmentUpdateExecutionContext,
+    StorageTaskAssignmentUpdateParameters,
+    StorageTaskAssignmentUpdateProperties,
+    StorageTaskAssignmentUpdateReport,
+    StorageTaskAssignmentsList,
+    StorageTaskReportInstance,
+    StorageTaskReportProperties,
+    StorageTaskReportSummary,
+    SystemData,
+    Table,
+    TableAccessPolicy,
+    TableServiceProperties,
+    TableSignedIdentifier,
+    TagFilter,
+    TagProperty,
+    TrackedResource,
+    TriggerParameters,
+    TriggerParametersUpdate,
+    UpdateHistoryProperty,
+    Usage,
+    UsageListResult,
+    UsageName,
+    UserAssignedIdentity,
+    VirtualNetworkRule,
+)
+
+from ._storage_management_client_enums import (  # type: ignore
+    AccessTier,
+    AccountImmutabilityPolicyState,
+    AccountStatus,
+    AccountType,
+    AllowedCopyScope,
+    AllowedMethods,
+    BlobInventoryPolicyName,
+    BlobRestoreProgressStatus,
+    Bypass,
+    CreatedByType,
+    DefaultAction,
+    DefaultSharePermission,
+    DirectoryServiceOptions,
+    DnsEndpointType,
+    EnabledProtocols,
+    EncryptionScopeSource,
+    EncryptionScopeState,
+    ExpirationAction,
+    ExtendedLocationTypes,
+    Format,
+    GeoReplicationStatus,
+    HttpProtocol,
+    IdentityType,
+    ImmutabilityPolicyState,
+    ImmutabilityPolicyUpdateType,
+    InventoryRuleType,
+    IssueType,
+    KeyPermission,
+    KeySource,
+    KeyType,
+    Kind,
+    LargeFileSharesState,
+    LeaseContainerRequestEnum,
+    LeaseDuration,
+    LeaseShareAction,
+    LeaseState,
+    LeaseStatus,
+    ListContainersInclude,
+    ListEncryptionScopesInclude,
+    ListLocalUserIncludeParam,
+    ManagementPolicyName,
+    MigrationName,
+    MigrationState,
+    MigrationStatus,
+    MinimumTlsVersion,
+    Name,
+    NetworkSecurityPerimeterConfigurationProvisioningState,
+    NspAccessRuleDirection,
+    ObjectType,
+    Permissions,
+    PostFailoverRedundancy,
+    PostPlannedFailoverRedundancy,
+    PrivateEndpointConnectionProvisioningState,
+    PrivateEndpointServiceConnectionStatus,
+    ProvisioningState,
+    PublicAccess,
+    PublicNetworkAccess,
+    Reason,
+    ReasonCode,
+    ResourceAssociationAccessMode,
+    RootSquashType,
+    RoutingChoice,
+    RuleType,
+    RunResult,
+    RunStatusEnum,
+    Schedule,
+    Services,
+    Severity,
+    ShareAccessTier,
+    SignedResource,
+    SignedResourceTypes,
+    SkuConversionStatus,
+    SkuName,
+    SkuTier,
+    State,
+    StorageAccountExpand,
+    TriggerType,
+    UsageUnit,
+)
 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__ = [
@@ -533,5 +544,5 @@
     "TriggerType",
     "UsageUnit",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/models/_models_py3.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/models/_models_py3.py
index c74c33699dcf..90c61b12f54f 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/models/_models_py3.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/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
 
 
@@ -440,7 +439,7 @@ def __init__(
         self.default_share_permission = default_share_permission
 
 
-class BlobContainer(AzureEntityResource):  # pylint: disable=too-many-instance-attributes
+class BlobContainer(AzureEntityResource):
     """Properties of the blob container, including Id, resource name, resource type, Etag.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -1142,7 +1141,7 @@ def __init__(self, **kwargs: Any) -> None:
         self.value = None
 
 
-class BlobServiceProperties(Resource):  # pylint: disable=too-many-instance-attributes
+class BlobServiceProperties(Resource):
     """The properties of a storage account’s Blob service.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -2651,7 +2650,7 @@ def __init__(
         self.protocol_settings = protocol_settings
 
 
-class FileShare(AzureEntityResource):  # pylint: disable=too-many-instance-attributes
+class FileShare(AzureEntityResource):
     """Properties of the file share, including Id, resource name, resource type, Etag.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -2809,7 +2808,7 @@ def __init__(
         self.snapshot_time = None
 
 
-class FileShareItem(AzureEntityResource):  # pylint: disable=too-many-instance-attributes
+class FileShareItem(AzureEntityResource):
     """The file share properties be listed out.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -3594,7 +3593,7 @@ class LeaseContainerRequest(_serialization.Model):
     All required parameters must be populated in order to send to server.
 
     :ivar action: Specifies the lease action. Can be one of the available actions. Required. Known
-     values are: "Acquire", "Renew", "Change", "Release", and "Break".
+     values are: "Acquire", "Renew", "Change", "Release", "Break", and "Break".
     :vartype action: str or ~azure.mgmt.storage.v2023_05_01.models.LeaseContainerRequestEnum
     :ivar lease_id: Identifies the lease. Can be specified in any valid GUID string format.
     :vartype lease_id: str
@@ -3633,7 +3632,7 @@ def __init__(
     ) -> None:
         """
         :keyword action: Specifies the lease action. Can be one of the available actions. Required.
-         Known values are: "Acquire", "Renew", "Change", "Release", and "Break".
+         Known values are: "Acquire", "Renew", "Change", "Release", "Break", and "Break".
         :paramtype action: str or ~azure.mgmt.storage.v2023_05_01.models.LeaseContainerRequestEnum
         :keyword lease_id: Identifies the lease. Can be specified in any valid GUID string format.
         :paramtype lease_id: str
@@ -3691,7 +3690,7 @@ class LeaseShareRequest(_serialization.Model):
     All required parameters must be populated in order to send to server.
 
     :ivar action: Specifies the lease action. Can be one of the available actions. Required. Known
-     values are: "Acquire", "Renew", "Change", "Release", and "Break".
+     values are: "Acquire", "Renew", "Change", "Release", "Break", and "Break".
     :vartype action: str or ~azure.mgmt.storage.v2023_05_01.models.LeaseShareAction
     :ivar lease_id: Identifies the lease. Can be specified in any valid GUID string format.
     :vartype lease_id: str
@@ -3730,7 +3729,7 @@ def __init__(
     ) -> None:
         """
         :keyword action: Specifies the lease action. Can be one of the available actions. Required.
-         Known values are: "Acquire", "Renew", "Change", "Release", and "Break".
+         Known values are: "Acquire", "Renew", "Change", "Release", "Break", and "Break".
         :paramtype action: str or ~azure.mgmt.storage.v2023_05_01.models.LeaseShareAction
         :keyword lease_id: Identifies the lease. Can be specified in any valid GUID string format.
         :paramtype lease_id: str
@@ -3928,7 +3927,7 @@ def __init__(self, **kwargs: Any) -> None:
         self.value = None
 
 
-class ListContainerItem(AzureEntityResource):  # pylint: disable=too-many-instance-attributes
+class ListContainerItem(AzureEntityResource):
     """The blob container properties be listed out.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -4296,7 +4295,7 @@ def __init__(self, **kwargs: Any) -> None:
         self.value = None
 
 
-class LocalUser(Resource):  # pylint: disable=too-many-instance-attributes
+class LocalUser(Resource):
     """The local user associated with the storage accounts.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -6461,7 +6460,7 @@ def __init__(
         self.expiration_action = expiration_action
 
 
-class ServiceSasParameters(_serialization.Model):  # pylint: disable=too-many-instance-attributes
+class ServiceSasParameters(_serialization.Model):
     """The parameters to list service SAS credentials of a specific resource.
 
     All required parameters must be populated in order to send to server.
@@ -6895,7 +6894,7 @@ class SshPublicKey(_serialization.Model):
 
     :ivar description: Optional. It is used to store the function/usage of the key.
     :vartype description: str
-    :ivar key: Ssh public key base64 encoded. The format should be: ':code:`<keyType>`
+    :ivar key: Ssh public key base64 encoded. The format should be: '\\ :code:`<keyType>`
      :code:`<keyData>`', e.g. ssh-rsa AAAABBBB.
     :vartype key: str
     """
@@ -6909,7 +6908,7 @@ def __init__(self, *, description: Optional[str] = None, key: Optional[str] = No
         """
         :keyword description: Optional. It is used to store the function/usage of the key.
         :paramtype description: str
-        :keyword key: Ssh public key base64 encoded. The format should be: ':code:`<keyType>`
+        :keyword key: Ssh public key base64 encoded. The format should be: '\\ :code:`<keyType>`
          :code:`<keyData>`', e.g. ssh-rsa AAAABBBB.
         :paramtype key: str
         """
@@ -6967,7 +6966,7 @@ def __init__(self, *, location: str, tags: Optional[Dict[str, str]] = None, **kw
         self.location = location
 
 
-class StorageAccount(TrackedResource):  # pylint: disable=too-many-instance-attributes
+class StorageAccount(TrackedResource):
     """The storage account.
 
     Variables are only populated by the server, and will be ignored when sending a request.
@@ -7414,7 +7413,7 @@ def __init__(self, *, name: str, **kwargs: Any) -> None:
         self.name = name
 
 
-class StorageAccountCreateParameters(_serialization.Model):  # pylint: disable=too-many-instance-attributes
+class StorageAccountCreateParameters(_serialization.Model):
     """The parameters used when creating a storage account.
 
     All required parameters must be populated in order to send to server.
@@ -8071,7 +8070,7 @@ def __init__(self, *, target_sku_name: Optional[Union[str, "_models.SkuName"]] =
         self.end_time = None
 
 
-class StorageAccountUpdateParameters(_serialization.Model):  # pylint: disable=too-many-instance-attributes
+class StorageAccountUpdateParameters(_serialization.Model):
     """The parameters that can be provided when updating the storage account properties.
 
     :ivar sku: Gets or sets the SKU name. Note that the SKU name cannot be updated to Standard_ZRS,
@@ -8827,7 +8826,7 @@ def __init__(self, *, properties: Optional["_models.StorageTaskReportProperties"
         self.properties = properties
 
 
-class StorageTaskReportProperties(_serialization.Model):  # pylint: disable=too-many-instance-attributes
+class StorageTaskReportProperties(_serialization.Model):
     """Storage task execution report for a run instance.
 
     Variables are only populated by the server, and will be ignored when sending a request.
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/models/_storage_management_client_enums.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/models/_storage_management_client_enums.py
index 2f2880a5b917..b3b0496d00f0 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/models/_storage_management_client_enums.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/models/_storage_management_client_enums.py
@@ -307,6 +307,7 @@ class LeaseContainerRequestEnum(str, Enum, metaclass=CaseInsensitiveEnumMeta):
     RENEW = "Renew"
     CHANGE = "Change"
     RELEASE = "Release"
+    BREAK = "Break"
     BREAK_ENUM = "Break"
 
 
@@ -326,6 +327,7 @@ class LeaseShareAction(str, Enum, metaclass=CaseInsensitiveEnumMeta):
     RENEW = "Renew"
     CHANGE = "Change"
     RELEASE = "Release"
+    BREAK = "Break"
     BREAK_ENUM = "Break"
 
 
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/__init__.py
index e62e153ac4a1..18334b99b3ea 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/__init__.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/__init__.py
@@ -5,34 +5,40 @@
 # 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 ._blob_services_operations import BlobServicesOperations
-from ._blob_containers_operations import BlobContainersOperations
-from ._file_services_operations import FileServicesOperations
-from ._file_shares_operations import FileSharesOperations
-from ._queue_services_operations import QueueServicesOperations
-from ._queue_operations import QueueOperations
-from ._operations import Operations
-from ._skus_operations import SkusOperations
-from ._storage_accounts_operations import StorageAccountsOperations
-from ._deleted_accounts_operations import DeletedAccountsOperations
-from ._usages_operations import UsagesOperations
-from ._management_policies_operations import ManagementPoliciesOperations
-from ._blob_inventory_policies_operations import BlobInventoryPoliciesOperations
-from ._private_endpoint_connections_operations import PrivateEndpointConnectionsOperations
-from ._private_link_resources_operations import PrivateLinkResourcesOperations
-from ._object_replication_policies_operations import ObjectReplicationPoliciesOperations
-from ._local_users_operations import LocalUsersOperations
-from ._encryption_scopes_operations import EncryptionScopesOperations
-from ._table_services_operations import TableServicesOperations
-from ._table_operations import TableOperations
-from ._network_security_perimeter_configurations_operations import NetworkSecurityPerimeterConfigurationsOperations
-from ._storage_task_assignments_operations import StorageTaskAssignmentsOperations
-from ._storage_task_assignments_instances_report_operations import StorageTaskAssignmentsInstancesReportOperations
-from ._storage_task_assignment_instances_report_operations import StorageTaskAssignmentInstancesReportOperations
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._blob_services_operations import BlobServicesOperations  # type: ignore
+from ._blob_containers_operations import BlobContainersOperations  # type: ignore
+from ._file_services_operations import FileServicesOperations  # type: ignore
+from ._file_shares_operations import FileSharesOperations  # type: ignore
+from ._queue_services_operations import QueueServicesOperations  # type: ignore
+from ._queue_operations import QueueOperations  # type: ignore
+from ._operations import Operations  # type: ignore
+from ._skus_operations import SkusOperations  # type: ignore
+from ._storage_accounts_operations import StorageAccountsOperations  # type: ignore
+from ._deleted_accounts_operations import DeletedAccountsOperations  # type: ignore
+from ._usages_operations import UsagesOperations  # type: ignore
+from ._management_policies_operations import ManagementPoliciesOperations  # type: ignore
+from ._blob_inventory_policies_operations import BlobInventoryPoliciesOperations  # type: ignore
+from ._private_endpoint_connections_operations import PrivateEndpointConnectionsOperations  # type: ignore
+from ._private_link_resources_operations import PrivateLinkResourcesOperations  # type: ignore
+from ._object_replication_policies_operations import ObjectReplicationPoliciesOperations  # type: ignore
+from ._local_users_operations import LocalUsersOperations  # type: ignore
+from ._encryption_scopes_operations import EncryptionScopesOperations  # type: ignore
+from ._table_services_operations import TableServicesOperations  # type: ignore
+from ._table_operations import TableOperations  # type: ignore
+from ._network_security_perimeter_configurations_operations import NetworkSecurityPerimeterConfigurationsOperations  # type: ignore
+from ._storage_task_assignments_operations import StorageTaskAssignmentsOperations  # type: ignore
+from ._storage_task_assignments_instances_report_operations import StorageTaskAssignmentsInstancesReportOperations  # type: ignore
+from ._storage_task_assignment_instances_report_operations import StorageTaskAssignmentInstancesReportOperations  # 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__ = [
@@ -61,5 +67,5 @@
     "StorageTaskAssignmentsInstancesReportOperations",
     "StorageTaskAssignmentInstancesReportOperations",
 ]
-__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/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_blob_containers_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_blob_containers_operations.py
index d32a67793c77..3dd86b4432b9 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_blob_containers_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_blob_containers_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,7 @@
 # --------------------------------------------------------------------------
 from io import IOBase
 import sys
-from typing import Any, Callable, Dict, IO, Iterable, Literal, Optional, Type, TypeVar, Union, cast, overload
+from typing import Any, Callable, Dict, IO, Iterable, Iterator, Literal, Optional, TypeVar, Union, cast, overload
 import urllib.parse
 
 from azure.core.exceptions import (
@@ -17,13 +17,14 @@
     ResourceExistsError,
     ResourceNotFoundError,
     ResourceNotModifiedError,
+    StreamClosedError,
+    StreamConsumedError,
     map_error,
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
 from azure.core.polling import LROPoller, NoPolling, PollingMethod
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
@@ -31,12 +32,11 @@
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -677,7 +677,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-05-01"))
         cls: ClsType[_models.ListContainerItems] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -699,7 +699,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -715,7 +714,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -850,7 +848,7 @@ def create(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -885,7 +883,6 @@ def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -899,11 +896,7 @@ def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("BlobContainer", pipeline_response)
-
-        if response.status_code == 201:
-            deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1013,7 +1006,7 @@ def update(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1048,7 +1041,6 @@ def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1062,7 +1054,7 @@ def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1091,7 +1083,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.BlobContainer
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1114,7 +1106,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1128,7 +1119,7 @@ def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobContainer", pipeline_response)
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1157,7 +1148,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,
@@ -1180,7 +1171,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1303,7 +1293,7 @@ def set_legal_hold(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.LegalHold
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1338,7 +1328,6 @@ def set_legal_hold(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1352,7 +1341,7 @@ def set_legal_hold(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LegalHold", pipeline_response)
+        deserialized = self._deserialize("LegalHold", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1462,7 +1451,7 @@ def clear_legal_hold(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.LegalHold
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1497,7 +1486,6 @@ def clear_legal_hold(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1511,7 +1499,7 @@ def clear_legal_hold(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LegalHold", pipeline_response)
+        deserialized = self._deserialize("LegalHold", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1545,9 +1533,9 @@ def create_or_update_immutability_policy(
          letters and dash (-) only. Every dash (-) character must be immediately preceded and followed
          by a letter or number. Required.
         :type container_name: str
-        :param if_match: The entity state (ETag) version of the immutability policy to update. A value
-         of "*" can be used to apply the operation only if the immutability policy already exists. If
-         omitted, this operation will always be applied. Default value is None.
+        :param if_match: The entity state (ETag) version of the immutability policy to update must be
+         returned to the server for all update operations. The ETag value must include the leading and
+         trailing double quotes as returned by the service. Default value is None.
         :type if_match: str
         :param parameters: The ImmutabilityPolicy Properties that will be created or updated to a blob
          container. Default value is None.
@@ -1587,9 +1575,9 @@ def create_or_update_immutability_policy(
          letters and dash (-) only. Every dash (-) character must be immediately preceded and followed
          by a letter or number. Required.
         :type container_name: str
-        :param if_match: The entity state (ETag) version of the immutability policy to update. A value
-         of "*" can be used to apply the operation only if the immutability policy already exists. If
-         omitted, this operation will always be applied. Default value is None.
+        :param if_match: The entity state (ETag) version of the immutability policy to update must be
+         returned to the server for all update operations. The ETag value must include the leading and
+         trailing double quotes as returned by the service. Default value is None.
         :type if_match: str
         :param parameters: The ImmutabilityPolicy Properties that will be created or updated to a blob
          container. Default value is None.
@@ -1627,9 +1615,9 @@ def create_or_update_immutability_policy(
          letters and dash (-) only. Every dash (-) character must be immediately preceded and followed
          by a letter or number. Required.
         :type container_name: str
-        :param if_match: The entity state (ETag) version of the immutability policy to update. A value
-         of "*" can be used to apply the operation only if the immutability policy already exists. If
-         omitted, this operation will always be applied. Default value is None.
+        :param if_match: The entity state (ETag) version of the immutability policy to update must be
+         returned to the server for all update operations. The ETag value must include the leading and
+         trailing double quotes as returned by the service. Default value is None.
         :type if_match: str
         :param parameters: The ImmutabilityPolicy Properties that will be created or updated to a blob
          container. Is either a ImmutabilityPolicy type or a IO[bytes] type. Default value is None.
@@ -1638,7 +1626,7 @@ def create_or_update_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1679,7 +1667,6 @@ def create_or_update_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1696,7 +1683,7 @@ def create_or_update_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1727,15 +1714,15 @@ def get_immutability_policy(
          letters and dash (-) only. Every dash (-) character must be immediately preceded and followed
          by a letter or number. Required.
         :type container_name: str
-        :param if_match: The entity state (ETag) version of the immutability policy to update. A value
-         of "*" can be used to apply the operation only if the immutability policy already exists. If
-         omitted, this operation will always be applied. Default value is None.
+        :param if_match: The entity state (ETag) version of the immutability policy to update must be
+         returned to the server for all update operations. The ETag value must include the leading and
+         trailing double quotes as returned by the service. Default value is None.
         :type if_match: str
         :return: ImmutabilityPolicy or the result of cls(response)
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1761,7 +1748,6 @@ def get_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1778,7 +1764,7 @@ def get_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1806,15 +1792,15 @@ def delete_immutability_policy(
          letters and dash (-) only. Every dash (-) character must be immediately preceded and followed
          by a letter or number. Required.
         :type container_name: str
-        :param if_match: The entity state (ETag) version of the immutability policy to update. A value
-         of "*" can be used to apply the operation only if the immutability policy already exists. If
-         omitted, this operation will always be applied. Required.
+        :param if_match: The entity state (ETag) version of the immutability policy to update must be
+         returned to the server for all update operations. The ETag value must include the leading and
+         trailing double quotes as returned by the service. Required.
         :type if_match: str
         :return: ImmutabilityPolicy or the result of cls(response)
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1840,7 +1826,6 @@ def delete_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1857,7 +1842,7 @@ def delete_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1883,15 +1868,15 @@ def lock_immutability_policy(
          letters and dash (-) only. Every dash (-) character must be immediately preceded and followed
          by a letter or number. Required.
         :type container_name: str
-        :param if_match: The entity state (ETag) version of the immutability policy to update. A value
-         of "*" can be used to apply the operation only if the immutability policy already exists. If
-         omitted, this operation will always be applied. Required.
+        :param if_match: The entity state (ETag) version of the immutability policy to update must be
+         returned to the server for all update operations. The ETag value must include the leading and
+         trailing double quotes as returned by the service. Required.
         :type if_match: str
         :return: ImmutabilityPolicy or the result of cls(response)
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1915,7 +1900,6 @@ def lock_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1932,7 +1916,7 @@ def lock_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -1967,9 +1951,9 @@ def extend_immutability_policy(
          letters and dash (-) only. Every dash (-) character must be immediately preceded and followed
          by a letter or number. Required.
         :type container_name: str
-        :param if_match: The entity state (ETag) version of the immutability policy to update. A value
-         of "*" can be used to apply the operation only if the immutability policy already exists. If
-         omitted, this operation will always be applied. Required.
+        :param if_match: The entity state (ETag) version of the immutability policy to update must be
+         returned to the server for all update operations. The ETag value must include the leading and
+         trailing double quotes as returned by the service. Required.
         :type if_match: str
         :param parameters: The ImmutabilityPolicy Properties that will be extended for a blob
          container. Default value is None.
@@ -2010,9 +1994,9 @@ def extend_immutability_policy(
          letters and dash (-) only. Every dash (-) character must be immediately preceded and followed
          by a letter or number. Required.
         :type container_name: str
-        :param if_match: The entity state (ETag) version of the immutability policy to update. A value
-         of "*" can be used to apply the operation only if the immutability policy already exists. If
-         omitted, this operation will always be applied. Required.
+        :param if_match: The entity state (ETag) version of the immutability policy to update must be
+         returned to the server for all update operations. The ETag value must include the leading and
+         trailing double quotes as returned by the service. Required.
         :type if_match: str
         :param parameters: The ImmutabilityPolicy Properties that will be extended for a blob
          container. Default value is None.
@@ -2051,9 +2035,9 @@ def extend_immutability_policy(
          letters and dash (-) only. Every dash (-) character must be immediately preceded and followed
          by a letter or number. Required.
         :type container_name: str
-        :param if_match: The entity state (ETag) version of the immutability policy to update. A value
-         of "*" can be used to apply the operation only if the immutability policy already exists. If
-         omitted, this operation will always be applied. Required.
+        :param if_match: The entity state (ETag) version of the immutability policy to update must be
+         returned to the server for all update operations. The ETag value must include the leading and
+         trailing double quotes as returned by the service. Required.
         :type if_match: str
         :param parameters: The ImmutabilityPolicy Properties that will be extended for a blob
          container. Is either a ImmutabilityPolicy type or a IO[bytes] type. Default value is None.
@@ -2062,7 +2046,7 @@ def extend_immutability_policy(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.ImmutabilityPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -2101,7 +2085,6 @@ def extend_immutability_policy(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -2118,7 +2101,7 @@ def extend_immutability_policy(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response)
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -2228,7 +2211,7 @@ def lease(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.LeaseContainerResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -2266,7 +2249,6 @@ def lease(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -2280,17 +2262,17 @@ def lease(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LeaseContainerResponse", pipeline_response)
+        deserialized = self._deserialize("LeaseContainerResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
 
         return deserialized  # type: ignore
 
-    def _object_level_worm_initial(  # pylint: disable=inconsistent-return-statements
+    def _object_level_worm_initial(
         self, resource_group_name: str, account_name: str, container_name: str, **kwargs: Any
-    ) -> None:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> Iterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -2302,7 +2284,7 @@ def _object_level_worm_initial(  # pylint: disable=inconsistent-return-statement
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-05-01"))
-        cls: ClsType[None] = kwargs.pop("cls", None)
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
 
         _request = build_object_level_worm_request(
             resource_group_name=resource_group_name,
@@ -2313,10 +2295,10 @@ def _object_level_worm_initial(  # pylint: disable=inconsistent-return-statement
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -2324,11 +2306,19 @@ def _object_level_worm_initial(  # pylint: disable=inconsistent-return-statement
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
-            return cls(pipeline_response, None, {})  # type: ignore
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
 
     @distributed_trace
     def begin_object_level_worm(
@@ -2364,7 +2354,7 @@ def begin_object_level_worm(
         lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
         cont_token: Optional[str] = kwargs.pop("continuation_token", None)
         if cont_token is None:
-            raw_result = self._object_level_worm_initial(  # type: ignore
+            raw_result = self._object_level_worm_initial(
                 resource_group_name=resource_group_name,
                 account_name=account_name,
                 container_name=container_name,
@@ -2374,6 +2364,7 @@ def begin_object_level_worm(
                 params=_params,
                 **kwargs
             )
+            raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_blob_inventory_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_blob_inventory_policies_operations.py
index 9f6143916daa..06e160463f59 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_blob_inventory_policies_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_blob_inventory_policies_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 (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -243,7 +240,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.BlobInventoryPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -266,7 +263,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -280,7 +276,7 @@ def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response)
+        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -384,7 +380,7 @@ def create_or_update(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.BlobInventoryPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -419,7 +415,6 @@ def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -433,7 +428,7 @@ def create_or_update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response)
+        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -465,7 +460,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,
@@ -488,7 +483,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -529,7 +523,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-05-01"))
         cls: ClsType[_models.ListBlobInventoryPolicy] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -548,7 +542,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -564,7 +557,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_blob_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_blob_services_operations.py
index ffd1e667b709..f12d7665321d 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_blob_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_blob_services_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, Literal, Optional, Type, TypeVar, Union, overload
+from typing import Any, Callable, Dict, IO, Iterable, Literal, Optional, TypeVar, Union, overload
 import urllib.parse
 
 from azure.core.exceptions import (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -197,7 +194,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-05-01"))
         cls: ClsType[_models.BlobServiceItems] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -216,7 +213,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -232,7 +228,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -349,7 +344,7 @@ def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.BlobServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -385,7 +380,6 @@ def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -399,7 +393,7 @@ def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobServiceProperties", pipeline_response)
+        deserialized = self._deserialize("BlobServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -424,7 +418,7 @@ def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.BlobServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -448,7 +442,6 @@ def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -462,7 +455,7 @@ def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("BlobServiceProperties", pipeline_response)
+        deserialized = self._deserialize("BlobServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_deleted_accounts_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_deleted_accounts_operations.py
index 398456eab3ca..6a77d39db4c1 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_deleted_accounts_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_deleted_accounts_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 (
@@ -20,20 +19,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -130,7 +127,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.DeletedAccount"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-05-01"))
         cls: ClsType[_models.DeletedAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -147,7 +144,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -163,7 +159,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -205,7 +200,7 @@ def get(self, deleted_account_name: str, location: str, **kwargs: Any) -> _model
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.DeletedAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -227,7 +222,6 @@ def get(self, deleted_account_name: str, location: str, **kwargs: Any) -> _model
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -242,7 +236,7 @@ def get(self, deleted_account_name: str, location: str, **kwargs: Any) -> _model
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("DeletedAccount", pipeline_response)
+        deserialized = self._deserialize("DeletedAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_encryption_scopes_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_encryption_scopes_operations.py
index b61140c015fa..89b8a8e34d83 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_encryption_scopes_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_encryption_scopes_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 (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -338,7 +335,7 @@ def put(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.EncryptionScope
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -373,7 +370,6 @@ def put(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -388,11 +384,7 @@ def put(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("EncryptionScope", pipeline_response)
-
-        if response.status_code == 201:
-            deserialized = self._deserialize("EncryptionScope", pipeline_response)
+        deserialized = self._deserialize("EncryptionScope", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -502,7 +494,7 @@ def patch(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.EncryptionScope
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -537,7 +529,6 @@ def patch(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -552,7 +543,7 @@ def patch(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("EncryptionScope", pipeline_response)
+        deserialized = self._deserialize("EncryptionScope", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -581,7 +572,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.EncryptionScope
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -604,7 +595,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -619,7 +609,7 @@ def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("EncryptionScope", pipeline_response)
+        deserialized = self._deserialize("EncryptionScope", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -664,7 +654,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-05-01"))
         cls: ClsType[_models.EncryptionScopeListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -686,7 +676,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -702,7 +691,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_file_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_file_services_operations.py
index 09a9851186bd..352a8ccb303d 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_file_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_file_services_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, Literal, Optional, Type, TypeVar, Union, overload
+from typing import Any, Callable, Dict, IO, Literal, Optional, TypeVar, Union, overload
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -19,20 +18,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -185,7 +182,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.FileServiceItems
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -207,7 +204,6 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -221,7 +217,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileServiceItems", pipeline_response)
+        deserialized = self._deserialize("FileServiceItems", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -316,7 +312,7 @@ def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.FileServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -352,7 +348,6 @@ def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -366,7 +361,7 @@ def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileServiceProperties", pipeline_response)
+        deserialized = self._deserialize("FileServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -391,7 +386,7 @@ def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.FileServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -415,7 +410,6 @@ def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -429,7 +423,7 @@ def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileServiceProperties", pipeline_response)
+        deserialized = self._deserialize("FileServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_file_shares_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_file_shares_operations.py
index d042bee52013..6ad1af90d0cc 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_file_shares_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_file_shares_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,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 (
@@ -21,20 +21,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -415,7 +413,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-05-01"))
         cls: ClsType[_models.FileShareItems] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -437,7 +435,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -453,7 +450,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -600,7 +596,7 @@ def create(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.FileShare
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -636,7 +632,6 @@ def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -650,11 +645,7 @@ def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("FileShare", pipeline_response)
-
-        if response.status_code == 201:
-            deserialized = self._deserialize("FileShare", pipeline_response)
+        deserialized = self._deserialize("FileShare", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -764,7 +755,7 @@ def update(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.FileShare
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -799,7 +790,6 @@ def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -813,7 +803,7 @@ def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileShare", pipeline_response)
+        deserialized = self._deserialize("FileShare", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -854,7 +844,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.FileShare
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -879,7 +869,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -893,7 +882,7 @@ def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("FileShare", pipeline_response)
+        deserialized = self._deserialize("FileShare", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -938,7 +927,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,
@@ -963,7 +952,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -981,7 +969,7 @@ def delete(  # pylint: disable=inconsistent-return-statements
             return cls(pipeline_response, None, {})  # type: ignore
 
     @overload
-    def restore(  # pylint: disable=inconsistent-return-statements
+    def restore(
         self,
         resource_group_name: str,
         account_name: str,
@@ -1016,7 +1004,7 @@ def restore(  # pylint: disable=inconsistent-return-statements
         """
 
     @overload
-    def restore(  # pylint: disable=inconsistent-return-statements
+    def restore(
         self,
         resource_group_name: str,
         account_name: str,
@@ -1079,7 +1067,7 @@ def restore(  # 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,
@@ -1114,7 +1102,6 @@ def restore(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1246,7 +1233,7 @@ def lease(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.LeaseShareResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1285,7 +1272,6 @@ def lease(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1302,7 +1288,7 @@ def lease(
         response_headers = {}
         response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
 
-        deserialized = self._deserialize("LeaseShareResponse", pipeline_response)
+        deserialized = self._deserialize("LeaseShareResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_local_users_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_local_users_operations.py
index 18f3dc431281..dc804b0c9bb3 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_local_users_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_local_users_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 (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -331,7 +328,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-05-01"))
         cls: ClsType[_models.LocalUsers] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -353,7 +350,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -369,7 +365,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -417,7 +412,7 @@ def get(self, resource_group_name: str, account_name: str, username: str, **kwar
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.LocalUser
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -440,7 +435,6 @@ def get(self, resource_group_name: str, account_name: str, username: str, **kwar
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -455,7 +449,7 @@ def get(self, resource_group_name: str, account_name: str, username: str, **kwar
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LocalUser", pipeline_response)
+        deserialized = self._deserialize("LocalUser", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -559,7 +553,7 @@ def create_or_update(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.LocalUser
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -594,7 +588,6 @@ def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -609,7 +602,7 @@ def create_or_update(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LocalUser", pipeline_response)
+        deserialized = self._deserialize("LocalUser", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -636,7 +629,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,
@@ -659,7 +652,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -697,7 +689,7 @@ def list_keys(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.LocalUserKeys
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -720,7 +712,6 @@ def list_keys(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -735,7 +726,7 @@ def list_keys(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LocalUserKeys", pipeline_response)
+        deserialized = self._deserialize("LocalUserKeys", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -762,7 +753,7 @@ def regenerate_password(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.LocalUserRegeneratePasswordResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -785,7 +776,6 @@ def regenerate_password(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -800,7 +790,7 @@ def regenerate_password(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("LocalUserRegeneratePasswordResult", pipeline_response)
+        deserialized = self._deserialize("LocalUserRegeneratePasswordResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_management_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_management_policies_operations.py
index cca94e4940b5..742075be5763 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_management_policies_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_management_policies_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,
@@ -19,20 +18,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -202,7 +199,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.ManagementPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -225,7 +222,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -239,7 +235,7 @@ def get(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ManagementPolicy", pipeline_response)
+        deserialized = self._deserialize("ManagementPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -343,7 +339,7 @@ def create_or_update(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.ManagementPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -378,7 +374,6 @@ def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -392,7 +387,7 @@ def create_or_update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ManagementPolicy", pipeline_response)
+        deserialized = self._deserialize("ManagementPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -424,7 +419,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,
@@ -447,7 +442,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_network_security_perimeter_configurations_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_network_security_perimeter_configurations_operations.py
index 0169a10d74bd..ff7ae649449d 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_network_security_perimeter_configurations_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_network_security_perimeter_configurations_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, Union, cast
+from typing import Any, Callable, Dict, Iterable, Iterator, Optional, TypeVar, Union, cast
 import urllib.parse
 
 from azure.core.exceptions import (
@@ -16,13 +15,14 @@
     ResourceExistsError,
     ResourceNotFoundError,
     ResourceNotModifiedError,
+    StreamClosedError,
+    StreamConsumedError,
     map_error,
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
 from azure.core.polling import LROPoller, NoPolling, PollingMethod
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
@@ -30,12 +30,11 @@
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -211,7 +210,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-05-01"))
         cls: ClsType[_models.NetworkSecurityPerimeterConfigurationList] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -230,7 +229,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -246,7 +244,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -300,7 +297,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.NetworkSecurityPerimeterConfiguration
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -323,7 +320,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -338,21 +334,21 @@ def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponseAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("NetworkSecurityPerimeterConfiguration", pipeline_response)
+        deserialized = self._deserialize("NetworkSecurityPerimeterConfiguration", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
 
         return deserialized  # type: ignore
 
-    def _reconcile_initial(  # pylint: disable=inconsistent-return-statements
+    def _reconcile_initial(
         self,
         resource_group_name: str,
         account_name: str,
         network_security_perimeter_configuration_name: str,
         **kwargs: Any
-    ) -> None:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> Iterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -364,7 +360,7 @@ def _reconcile_initial(  # pylint: disable=inconsistent-return-statements
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-05-01"))
-        cls: ClsType[None] = kwargs.pop("cls", None)
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
 
         _request = build_reconcile_request(
             resource_group_name=resource_group_name,
@@ -375,10 +371,10 @@ def _reconcile_initial(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -386,6 +382,10 @@ def _reconcile_initial(  # pylint: disable=inconsistent-return-statements
         response = pipeline_response.http_response
 
         if response.status_code not in [202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponseAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
@@ -393,8 +393,12 @@ def _reconcile_initial(  # pylint: disable=inconsistent-return-statements
         response_headers = {}
         response_headers["Location"] = self._deserialize("str", response.headers.get("Location"))
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
-            return cls(pipeline_response, None, response_headers)  # type: ignore
+            return cls(pipeline_response, deserialized, response_headers)  # type: ignore
+
+        return deserialized  # type: ignore
 
     @distributed_trace
     def begin_reconcile(
@@ -429,7 +433,7 @@ def begin_reconcile(
         lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
         cont_token: Optional[str] = kwargs.pop("continuation_token", None)
         if cont_token is None:
-            raw_result = self._reconcile_initial(  # type: ignore
+            raw_result = self._reconcile_initial(
                 resource_group_name=resource_group_name,
                 account_name=account_name,
                 network_security_perimeter_configuration_name=network_security_perimeter_configuration_name,
@@ -439,6 +443,7 @@ def begin_reconcile(
                 params=_params,
                 **kwargs
             )
+            raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_object_replication_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_object_replication_policies_operations.py
index 31b830139956..2a7352c55cdd 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_object_replication_policies_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_object_replication_policies_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 (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -237,7 +234,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-05-01"))
         cls: ClsType[_models.ObjectReplicationPolicies] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -256,7 +253,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -272,7 +268,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -324,7 +319,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.ObjectReplicationPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -347,7 +342,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -362,7 +356,7 @@ def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response)
+        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -472,7 +466,7 @@ def create_or_update(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.ObjectReplicationPolicy
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -507,7 +501,6 @@ def create_or_update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -522,7 +515,7 @@ def create_or_update(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response)
+        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -551,7 +544,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,
@@ -574,7 +567,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_operations.py
index 4a22fa107df6..55024e1890bf 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/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 (
@@ -20,20 +19,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -94,7 +91,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.Operation"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-05-01"))
         cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -110,7 +107,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -126,7 +122,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_private_endpoint_connections_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_private_endpoint_connections_operations.py
index 208024e89447..732e198e3545 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_private_endpoint_connections_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_private_endpoint_connections_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 (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -249,7 +246,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-05-01"))
         cls: ClsType[_models.PrivateEndpointConnectionListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -268,7 +265,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -284,7 +280,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -333,7 +328,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.PrivateEndpointConnection
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -356,7 +351,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -371,7 +365,7 @@ def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response)
+        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -472,7 +466,7 @@ def put(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.PrivateEndpointConnection
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -507,7 +501,6 @@ def put(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -522,7 +515,7 @@ def put(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response)
+        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -549,7 +542,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,
@@ -572,7 +565,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_private_link_resources_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_private_link_resources_operations.py
index 97fbf7cfb78f..d43255bee032 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_private_link_resources_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_private_link_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, Optional, Type, TypeVar
+from typing import Any, Callable, Dict, Optional, TypeVar
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -18,20 +17,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -111,7 +108,7 @@ def list_by_storage_account(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.PrivateLinkResourceListResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -133,7 +130,6 @@ def list_by_storage_account(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -147,7 +143,7 @@ def list_by_storage_account(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("PrivateLinkResourceListResult", pipeline_response)
+        deserialized = self._deserialize("PrivateLinkResourceListResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_queue_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_queue_operations.py
index 0f1af08d4e05..cfbb67045e3c 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_queue_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_queue_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 (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -385,7 +382,7 @@ def create(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.StorageQueue
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -420,7 +417,6 @@ def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -434,7 +430,7 @@ def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageQueue", pipeline_response)
+        deserialized = self._deserialize("StorageQueue", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -541,7 +537,7 @@ def update(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.StorageQueue
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -576,7 +572,6 @@ def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -590,7 +585,7 @@ def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageQueue", pipeline_response)
+        deserialized = self._deserialize("StorageQueue", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -617,7 +612,7 @@ def get(self, resource_group_name: str, account_name: str, queue_name: str, **kw
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.StorageQueue
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -640,7 +635,6 @@ def get(self, resource_group_name: str, account_name: str, queue_name: str, **kw
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -654,7 +648,7 @@ def get(self, resource_group_name: str, account_name: str, queue_name: str, **kw
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageQueue", pipeline_response)
+        deserialized = self._deserialize("StorageQueue", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -683,7 +677,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,
@@ -706,7 +700,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -757,7 +750,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-05-01"))
         cls: ClsType[_models.ListQueueResource] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -778,7 +771,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -794,7 +786,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_queue_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_queue_services_operations.py
index 5000085e380e..a68ce95f429b 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_queue_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_queue_services_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, Literal, Optional, Type, TypeVar, Union, overload
+from typing import Any, Callable, Dict, IO, Literal, Optional, TypeVar, Union, overload
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -19,20 +18,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -185,7 +182,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.ListQueueServices
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -207,7 +204,6 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -221,7 +217,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListQueueServices", pipeline_response)
+        deserialized = self._deserialize("ListQueueServices", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -316,7 +312,7 @@ def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.QueueServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -352,7 +348,6 @@ def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -366,7 +361,7 @@ def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("QueueServiceProperties", pipeline_response)
+        deserialized = self._deserialize("QueueServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -391,7 +386,7 @@ def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.QueueServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -415,7 +410,6 @@ def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -429,7 +423,7 @@ def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("QueueServiceProperties", pipeline_response)
+        deserialized = self._deserialize("QueueServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_skus_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_skus_operations.py
index bb41df7d34a8..a2c86e63f8b0 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_skus_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_skus_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 (
@@ -20,20 +19,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -99,7 +96,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.SkuInformation"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-05-01"))
         cls: ClsType[_models.StorageSkuListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -116,7 +113,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -132,7 +128,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_storage_accounts_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_storage_accounts_operations.py
index 2574c28e8b16..b1f182b3132a 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_storage_accounts_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_storage_accounts_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,7 @@
 # --------------------------------------------------------------------------
 from io import IOBase
 import sys
-from typing import Any, Callable, Dict, IO, Iterable, Literal, Optional, Type, TypeVar, Union, cast, overload
+from typing import Any, Callable, Dict, IO, Iterable, Iterator, Literal, Optional, TypeVar, Union, cast, overload
 import urllib.parse
 
 from azure.core.exceptions import (
@@ -17,13 +17,14 @@
     ResourceExistsError,
     ResourceNotFoundError,
     ResourceNotModifiedError,
+    StreamClosedError,
+    StreamConsumedError,
     map_error,
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
 from azure.core.polling import LROPoller, NoPolling, PollingMethod
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
@@ -31,12 +32,11 @@
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -758,7 +758,7 @@ def check_name_availability(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.CheckNameAvailabilityResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -790,7 +790,6 @@ def check_name_availability(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -804,7 +803,7 @@ def check_name_availability(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response)
+        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -817,8 +816,8 @@ def _create_initial(
         account_name: str,
         parameters: Union[_models.StorageAccountCreateParameters, IO[bytes]],
         **kwargs: Any
-    ) -> Optional[_models.StorageAccount]:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> Iterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -831,7 +830,7 @@ def _create_initial(
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-05-01"))
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
-        cls: ClsType[Optional[_models.StorageAccount]] = kwargs.pop("cls", None)
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
         _json = None
@@ -852,10 +851,10 @@ def _create_initial(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -863,12 +862,14 @@ def _create_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = None
-        if response.status_code == 200:
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -991,10 +992,11 @@ def begin_create(
                 params=_params,
                 **kwargs
             )
+            raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):
-            deserialized = self._deserialize("StorageAccount", pipeline_response)
+            deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
             if cls:
                 return cls(pipeline_response, deserialized, {})  # type: ignore
             return deserialized
@@ -1033,7 +1035,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,
@@ -1055,7 +1057,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1100,7 +1101,7 @@ def get_properties(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1123,7 +1124,6 @@ def get_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1137,7 +1137,7 @@ def get_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1248,7 +1248,7 @@ def update(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.StorageAccount
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1282,7 +1282,6 @@ def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1296,7 +1295,7 @@ def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccount", pipeline_response)
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1318,7 +1317,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.StorageAccount"]:
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-05-01"))
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1335,7 +1334,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -1351,7 +1349,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -1398,7 +1395,7 @@ def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> Ite
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-05-01"))
         cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1416,7 +1413,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -1432,7 +1428,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
@@ -1482,7 +1477,7 @@ def list_keys(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.StorageAccountListKeysResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1505,7 +1500,6 @@ def list_keys(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1519,7 +1513,7 @@ def list_keys(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response)
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1613,7 +1607,7 @@ def regenerate_key(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.StorageAccountListKeysResult
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1647,7 +1641,6 @@ def regenerate_key(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1661,7 +1654,7 @@ def regenerate_key(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response)
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1752,7 +1745,7 @@ def list_account_sas(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.ListAccountSasResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1786,7 +1779,6 @@ def list_account_sas(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1800,7 +1792,7 @@ def list_account_sas(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListAccountSasResponse", pipeline_response)
+        deserialized = self._deserialize("ListAccountSasResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -1889,7 +1881,7 @@ def list_service_sas(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.ListServiceSasResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1923,7 +1915,6 @@ def list_service_sas(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1937,17 +1928,17 @@ def list_service_sas(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListServiceSasResponse", pipeline_response)
+        deserialized = self._deserialize("ListServiceSasResponse", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
 
         return deserialized  # type: ignore
 
-    def _failover_initial(  # pylint: disable=inconsistent-return-statements
+    def _failover_initial(
         self, resource_group_name: str, account_name: str, failover_type: Literal["Planned"] = "Planned", **kwargs: Any
-    ) -> None:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> Iterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -1959,7 +1950,7 @@ def _failover_initial(  # pylint: disable=inconsistent-return-statements
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-05-01"))
-        cls: ClsType[None] = kwargs.pop("cls", None)
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
 
         _request = build_failover_request(
             resource_group_name=resource_group_name,
@@ -1970,10 +1961,10 @@ def _failover_initial(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -1981,11 +1972,19 @@ def _failover_initial(  # pylint: disable=inconsistent-return-statements
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
-            return cls(pipeline_response, None, {})  # type: ignore
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
 
     @distributed_trace
     def begin_failover(
@@ -2026,7 +2025,7 @@ def begin_failover(
         lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
         cont_token: Optional[str] = kwargs.pop("continuation_token", None)
         if cont_token is None:
-            raw_result = self._failover_initial(  # type: ignore
+            raw_result = self._failover_initial(
                 resource_group_name=resource_group_name,
                 account_name=account_name,
                 failover_type=failover_type,
@@ -2036,6 +2035,7 @@ def begin_failover(
                 params=_params,
                 **kwargs
             )
+            raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
@@ -2059,10 +2059,10 @@ def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-
             )
         return LROPoller[None](self._client, raw_result, get_long_running_output, polling_method)  # type: ignore
 
-    def _hierarchical_namespace_migration_initial(  # pylint: disable=inconsistent-return-statements,name-too-long
+    def _hierarchical_namespace_migration_initial(  # pylint: disable=name-too-long
         self, resource_group_name: str, account_name: str, request_type: str, **kwargs: Any
-    ) -> None:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> Iterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -2074,7 +2074,7 @@ def _hierarchical_namespace_migration_initial(  # pylint: disable=inconsistent-r
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-05-01"))
-        cls: ClsType[None] = kwargs.pop("cls", None)
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
 
         _request = build_hierarchical_namespace_migration_request(
             resource_group_name=resource_group_name,
@@ -2085,10 +2085,10 @@ def _hierarchical_namespace_migration_initial(  # pylint: disable=inconsistent-r
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -2096,12 +2096,20 @@ def _hierarchical_namespace_migration_initial(  # pylint: disable=inconsistent-r
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
-            return cls(pipeline_response, None, {})  # type: ignore
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
 
     @distributed_trace
     def begin_hierarchical_namespace_migration(
@@ -2134,7 +2142,7 @@ def begin_hierarchical_namespace_migration(
         lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
         cont_token: Optional[str] = kwargs.pop("continuation_token", None)
         if cont_token is None:
-            raw_result = self._hierarchical_namespace_migration_initial(  # type: ignore
+            raw_result = self._hierarchical_namespace_migration_initial(
                 resource_group_name=resource_group_name,
                 account_name=account_name,
                 request_type=request_type,
@@ -2144,6 +2152,7 @@ def begin_hierarchical_namespace_migration(
                 params=_params,
                 **kwargs
             )
+            raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
@@ -2167,10 +2176,10 @@ def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-
             )
         return LROPoller[None](self._client, raw_result, get_long_running_output, polling_method)  # type: ignore
 
-    def _abort_hierarchical_namespace_migration_initial(  # pylint: disable=inconsistent-return-statements,name-too-long
+    def _abort_hierarchical_namespace_migration_initial(  # pylint: disable=name-too-long
         self, resource_group_name: str, account_name: str, **kwargs: Any
-    ) -> None:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> Iterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -2182,7 +2191,7 @@ def _abort_hierarchical_namespace_migration_initial(  # pylint: disable=inconsis
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-05-01"))
-        cls: ClsType[None] = kwargs.pop("cls", None)
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
 
         _request = build_abort_hierarchical_namespace_migration_request(
             resource_group_name=resource_group_name,
@@ -2192,10 +2201,10 @@ def _abort_hierarchical_namespace_migration_initial(  # pylint: disable=inconsis
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -2203,12 +2212,20 @@ def _abort_hierarchical_namespace_migration_initial(  # pylint: disable=inconsis
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
-            return cls(pipeline_response, None, {})  # type: ignore
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
 
     @distributed_trace
     def begin_abort_hierarchical_namespace_migration(  # pylint: disable=name-too-long
@@ -2236,7 +2253,7 @@ def begin_abort_hierarchical_namespace_migration(  # pylint: disable=name-too-lo
         lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
         cont_token: Optional[str] = kwargs.pop("continuation_token", None)
         if cont_token is None:
-            raw_result = self._abort_hierarchical_namespace_migration_initial(  # type: ignore
+            raw_result = self._abort_hierarchical_namespace_migration_initial(
                 resource_group_name=resource_group_name,
                 account_name=account_name,
                 api_version=api_version,
@@ -2245,6 +2262,7 @@ def begin_abort_hierarchical_namespace_migration(  # pylint: disable=name-too-lo
                 params=_params,
                 **kwargs
             )
+            raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
@@ -2268,14 +2286,14 @@ def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-
             )
         return LROPoller[None](self._client, raw_result, get_long_running_output, polling_method)  # type: ignore
 
-    def _customer_initiated_migration_initial(  # pylint: disable=inconsistent-return-statements
+    def _customer_initiated_migration_initial(
         self,
         resource_group_name: str,
         account_name: str,
         parameters: Union[_models.StorageAccountMigration, IO[bytes]],
         **kwargs: Any
-    ) -> None:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> Iterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -2288,7 +2306,7 @@ def _customer_initiated_migration_initial(  # pylint: disable=inconsistent-retur
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-05-01"))
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
-        cls: ClsType[None] = kwargs.pop("cls", None)
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
         _json = None
@@ -2309,10 +2327,10 @@ def _customer_initiated_migration_initial(  # pylint: disable=inconsistent-retur
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -2320,6 +2338,10 @@ def _customer_initiated_migration_initial(  # pylint: disable=inconsistent-retur
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponseAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
@@ -2328,8 +2350,12 @@ def _customer_initiated_migration_initial(  # pylint: disable=inconsistent-retur
         if response.status_code == 202:
             response_headers["Location"] = self._deserialize("str", response.headers.get("Location"))
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
-            return cls(pipeline_response, None, response_headers)  # type: ignore
+            return cls(pipeline_response, deserialized, response_headers)  # type: ignore
+
+        return deserialized  # type: ignore
 
     @overload
     def begin_customer_initiated_migration(
@@ -2437,7 +2463,7 @@ def begin_customer_initiated_migration(
         lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
         cont_token: Optional[str] = kwargs.pop("continuation_token", None)
         if cont_token is None:
-            raw_result = self._customer_initiated_migration_initial(  # type: ignore
+            raw_result = self._customer_initiated_migration_initial(
                 resource_group_name=resource_group_name,
                 account_name=account_name,
                 parameters=parameters,
@@ -2448,6 +2474,7 @@ def begin_customer_initiated_migration(
                 params=_params,
                 **kwargs
             )
+            raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
@@ -2495,7 +2522,7 @@ def get_customer_initiated_migration(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.StorageAccountMigration
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -2518,7 +2545,6 @@ def get_customer_initiated_migration(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -2533,7 +2559,7 @@ def get_customer_initiated_migration(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponseAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageAccountMigration", pipeline_response)
+        deserialized = self._deserialize("StorageAccountMigration", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -2546,8 +2572,8 @@ def _restore_blob_ranges_initial(
         account_name: str,
         parameters: Union[_models.BlobRestoreParameters, IO[bytes]],
         **kwargs: Any
-    ) -> _models.BlobRestoreStatus:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> Iterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -2560,7 +2586,7 @@ def _restore_blob_ranges_initial(
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-05-01"))
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
-        cls: ClsType[_models.BlobRestoreStatus] = kwargs.pop("cls", None)
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
         _json = None
@@ -2581,10 +2607,10 @@ def _restore_blob_ranges_initial(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -2592,14 +2618,14 @@ def _restore_blob_ranges_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        if response.status_code == 200:
-            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response)
-
-        if response.status_code == 202:
-            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response)
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -2712,10 +2738,11 @@ def begin_restore_blob_ranges(
                 params=_params,
                 **kwargs
             )
+            raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):
-            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response)
+            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response.http_response)
             if cls:
                 return cls(pipeline_response, deserialized, {})  # type: ignore
             return deserialized
@@ -2756,7 +2783,7 @@ def revoke_user_delegation_keys(  # pylint: disable=inconsistent-return-statemen
         :rtype: None
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -2778,7 +2805,6 @@ def revoke_user_delegation_keys(  # pylint: disable=inconsistent-return-statemen
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_storage_task_assignment_instances_report_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_storage_task_assignment_instances_report_operations.py
index 34765c39c0f4..87085a027282 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_storage_task_assignment_instances_report_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_storage_task_assignment_instances_report_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 (
@@ -20,20 +19,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -125,6 +122,7 @@ def list(
         filter: Optional[str] = None,
         **kwargs: Any
     ) -> Iterable["_models.StorageTaskReportInstance"]:
+        # pylint: disable=line-too-long
         """Fetch the report summary of a single storage task assignment's instances.
 
         :param resource_group_name: The name of the resource group. The name is case insensitive.
@@ -158,7 +156,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-05-01"))
         cls: ClsType[_models.StorageTaskReportSummary] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -180,7 +178,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -196,7 +193,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_storage_task_assignments_instances_report_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_storage_task_assignments_instances_report_operations.py
index b3a48e443c78..be0537874d68 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_storage_task_assignments_instances_report_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_storage_task_assignments_instances_report_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 (
@@ -20,20 +19,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -115,6 +112,7 @@ def list(
         filter: Optional[str] = None,
         **kwargs: Any
     ) -> Iterable["_models.StorageTaskReportInstance"]:
+        # pylint: disable=line-too-long
         """Fetch the report summary of all the storage task assignments and instances in an account.
 
         :param resource_group_name: The name of the resource group. The name is case insensitive.
@@ -144,7 +142,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-05-01"))
         cls: ClsType[_models.StorageTaskReportSummary] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -165,7 +163,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -181,7 +178,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_storage_task_assignments_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_storage_task_assignments_operations.py
index 56faed5628a1..65bd194305ce 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_storage_task_assignments_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_storage_task_assignments_operations.py
@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-statements
+# pylint: disable=too-many-lines
 # coding=utf-8
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8,7 +8,7 @@
 # --------------------------------------------------------------------------
 from io import IOBase
 import sys
-from typing import Any, Callable, Dict, IO, Iterable, 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 (
@@ -17,13 +17,14 @@
     ResourceExistsError,
     ResourceNotFoundError,
     ResourceNotModifiedError,
+    StreamClosedError,
+    StreamConsumedError,
     map_error,
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
 from azure.core.polling import LROPoller, NoPolling, PollingMethod
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
@@ -31,12 +32,11 @@
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -291,8 +291,8 @@ def _create_initial(
         storage_task_assignment_name: str,
         parameters: Union[_models.StorageTaskAssignment, IO[bytes]],
         **kwargs: Any
-    ) -> Optional[_models.StorageTaskAssignment]:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> Iterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -305,7 +305,7 @@ def _create_initial(
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-05-01"))
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
-        cls: ClsType[Optional[_models.StorageTaskAssignment]] = kwargs.pop("cls", None)
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
         _json = None
@@ -327,10 +327,10 @@ def _create_initial(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -338,21 +338,20 @@ def _create_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 201, 202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponseAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = None
         response_headers = {}
-        if response.status_code == 200:
-            deserialized = self._deserialize("StorageTaskAssignment", pipeline_response)
-
-        if response.status_code == 201:
-            deserialized = self._deserialize("StorageTaskAssignment", pipeline_response)
-
         if response.status_code == 202:
             response_headers["Location"] = self._deserialize("str", response.headers.get("Location"))
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
 
@@ -495,10 +494,11 @@ def begin_create(
                 params=_params,
                 **kwargs
             )
+            raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):
-            deserialized = self._deserialize("StorageTaskAssignment", pipeline_response)
+            deserialized = self._deserialize("StorageTaskAssignment", pipeline_response.http_response)
             if cls:
                 return cls(pipeline_response, deserialized, {})  # type: ignore
             return deserialized
@@ -529,8 +529,8 @@ def _update_initial(
         storage_task_assignment_name: str,
         parameters: Union[_models.StorageTaskAssignmentUpdateParameters, IO[bytes]],
         **kwargs: Any
-    ) -> Optional[_models.StorageTaskAssignment]:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> Iterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -543,7 +543,7 @@ def _update_initial(
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-05-01"))
         content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
-        cls: ClsType[Optional[_models.StorageTaskAssignment]] = kwargs.pop("cls", None)
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
 
         content_type = content_type or "application/json"
         _json = None
@@ -565,10 +565,10 @@ def _update_initial(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -576,18 +576,20 @@ def _update_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponseAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = None
         response_headers = {}
-        if response.status_code == 200:
-            deserialized = self._deserialize("StorageTaskAssignment", pipeline_response)
-
         if response.status_code == 202:
             response_headers["Location"] = self._deserialize("str", response.headers.get("Location"))
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
 
@@ -719,10 +721,11 @@ def begin_update(
                 params=_params,
                 **kwargs
             )
+            raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):
-            deserialized = self._deserialize("StorageTaskAssignment", pipeline_response)
+            deserialized = self._deserialize("StorageTaskAssignment", pipeline_response.http_response)
             if cls:
                 return cls(pipeline_response, deserialized, {})  # type: ignore
             return deserialized
@@ -767,7 +770,7 @@ def get(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.StorageTaskAssignment
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -790,7 +793,6 @@ def get(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -805,17 +807,17 @@ def get(
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponseAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("StorageTaskAssignment", pipeline_response)
+        deserialized = self._deserialize("StorageTaskAssignment", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
 
         return deserialized  # type: ignore
 
-    def _delete_initial(  # pylint: disable=inconsistent-return-statements
+    def _delete_initial(
         self, resource_group_name: str, account_name: str, storage_task_assignment_name: str, **kwargs: Any
-    ) -> None:
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+    ) -> Iterator[bytes]:
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -827,7 +829,7 @@ def _delete_initial(  # pylint: disable=inconsistent-return-statements
         _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
 
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-05-01"))
-        cls: ClsType[None] = kwargs.pop("cls", None)
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
 
         _request = build_delete_request(
             resource_group_name=resource_group_name,
@@ -838,10 +840,10 @@ def _delete_initial(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _stream = False
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
         pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
         )
@@ -849,6 +851,10 @@ def _delete_initial(  # pylint: disable=inconsistent-return-statements
         response = pipeline_response.http_response
 
         if response.status_code not in [202, 204]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             error = self._deserialize.failsafe_deserialize(_models.ErrorResponseAutoGenerated, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
@@ -857,8 +863,12 @@ def _delete_initial(  # pylint: disable=inconsistent-return-statements
         if response.status_code == 202:
             response_headers["Location"] = self._deserialize("str", response.headers.get("Location"))
 
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
         if cls:
-            return cls(pipeline_response, None, response_headers)  # type: ignore
+            return cls(pipeline_response, deserialized, response_headers)  # type: ignore
+
+        return deserialized  # type: ignore
 
     @distributed_trace
     def begin_delete(
@@ -890,7 +900,7 @@ def begin_delete(
         lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
         cont_token: Optional[str] = kwargs.pop("continuation_token", None)
         if cont_token is None:
-            raw_result = self._delete_initial(  # type: ignore
+            raw_result = self._delete_initial(
                 resource_group_name=resource_group_name,
                 account_name=account_name,
                 storage_task_assignment_name=storage_task_assignment_name,
@@ -900,6 +910,7 @@ def begin_delete(
                 params=_params,
                 **kwargs
             )
+            raw_result.http_response.read()  # type: ignore
         kwargs.pop("error_map", None)
 
         def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
@@ -951,7 +962,7 @@ def list(
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-05-01"))
         cls: ClsType[_models.StorageTaskAssignmentsList] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -971,7 +982,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -987,7 +997,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_table_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_table_operations.py
index 0950d5cfb466..54bdd2874f5d 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_table_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_table_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 (
@@ -21,20 +20,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -350,7 +347,7 @@ def create(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.Table
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -388,7 +385,6 @@ def create(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -402,7 +398,7 @@ def create(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("Table", pipeline_response)
+        deserialized = self._deserialize("Table", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -506,7 +502,7 @@ def update(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.Table
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -544,7 +540,6 @@ def update(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -558,7 +553,7 @@ def update(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("Table", pipeline_response)
+        deserialized = self._deserialize("Table", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -584,7 +579,7 @@ def get(self, resource_group_name: str, account_name: str, table_name: str, **kw
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.Table
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -607,7 +602,6 @@ def get(self, resource_group_name: str, account_name: str, table_name: str, **kw
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -621,7 +615,7 @@ def get(self, resource_group_name: str, account_name: str, table_name: str, **kw
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("Table", pipeline_response)
+        deserialized = self._deserialize("Table", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -649,7 +643,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,
@@ -672,7 +666,6 @@ def delete(  # pylint: disable=inconsistent-return-statements
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -710,7 +703,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> It
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-05-01"))
         cls: ClsType[_models.ListTableResource] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -729,7 +722,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -745,7 +737,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_table_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_table_services_operations.py
index 509118c8dea7..fe242dac6140 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_table_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_table_services_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, Literal, Optional, Type, TypeVar, Union, overload
+from typing import Any, Callable, Dict, IO, Literal, Optional, TypeVar, Union, overload
 
 from azure.core.exceptions import (
     ClientAuthenticationError,
@@ -19,20 +18,18 @@
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -185,7 +182,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.ListTableServices
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -207,7 +204,6 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -221,7 +217,7 @@ def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _m
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("ListTableServices", pipeline_response)
+        deserialized = self._deserialize("ListTableServices", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -316,7 +312,7 @@ def set_service_properties(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.TableServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -352,7 +348,6 @@ def set_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -366,7 +361,7 @@ def set_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("TableServiceProperties", pipeline_response)
+        deserialized = self._deserialize("TableServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -391,7 +386,7 @@ def get_service_properties(
         :rtype: ~azure.mgmt.storage.v2023_05_01.models.TableServiceProperties
         :raises ~azure.core.exceptions.HttpResponseError:
         """
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -415,7 +410,6 @@ def get_service_properties(
             headers=_headers,
             params=_params,
         )
-        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -429,7 +423,7 @@ def get_service_properties(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = self._deserialize("TableServiceProperties", pipeline_response)
+        deserialized = self._deserialize("TableServiceProperties", pipeline_response.http_response)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_usages_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_usages_operations.py
index a14425f4335a..a773cd696cf8 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_usages_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2023_05_01/operations/_usages_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 (
@@ -20,20 +19,18 @@
 )
 from azure.core.paging import ItemPaged
 from azure.core.pipeline import PipelineResponse
-from azure.core.pipeline.transport import HttpResponse
-from azure.core.rest import HttpRequest
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.utils import case_insensitive_dict
 from azure.mgmt.core.exceptions import ARMErrorFormat
 
 from .. import models as _models
 from ..._serialization import Serializer
-from .._vendor import _convert_request
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
 else:
-    from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
+    from typing import MutableMapping  # type: ignore
 T = TypeVar("T")
 ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
 
@@ -105,7 +102,7 @@ def list_by_location(self, location: str, **kwargs: Any) -> Iterable["_models.Us
         api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2023-05-01"))
         cls: ClsType[_models.UsageListResult] = kwargs.pop("cls", None)
 
-        error_map: MutableMapping[int, Type[HttpResponseError]] = {
+        error_map: MutableMapping = {
             401: ClientAuthenticationError,
             404: ResourceNotFoundError,
             409: ResourceExistsError,
@@ -123,7 +120,6 @@ def prepare_request(next_link=None):
                     headers=_headers,
                     params=_params,
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
 
             else:
@@ -139,7 +135,6 @@ def prepare_request(next_link=None):
                 _request = HttpRequest(
                     "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
                 )
-                _request = _convert_request(_request)
                 _request.url = self._client.format_url(_request.url)
                 _request.method = "GET"
             return _request
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/__init__.py
new file mode 100644
index 000000000000..60980065e1ee
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/__init__.py
@@ -0,0 +1,32 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+# pylint: disable=wrong-import-position
+
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._storage_management_client import StorageManagementClient  # type: ignore
+from ._version import VERSION
+
+__version__ = VERSION
+
+try:
+    from ._patch import __all__ as _patch_all
+    from ._patch import *
+except ImportError:
+    _patch_all = []
+from ._patch import patch_sdk as _patch_sdk
+
+__all__ = [
+    "StorageManagementClient",
+]
+__all__.extend([p for p in _patch_all if p not in __all__])  # pyright: ignore
+
+_patch_sdk()
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/_configuration.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/_configuration.py
new file mode 100644
index 000000000000..e0c260142f24
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/_configuration.py
@@ -0,0 +1,64 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+
+from typing import Any, TYPE_CHECKING
+
+from azure.core.pipeline import policies
+from azure.mgmt.core.policies import ARMChallengeAuthenticationPolicy, ARMHttpLoggingPolicy
+
+from ._version import VERSION
+
+if TYPE_CHECKING:
+    from azure.core.credentials import TokenCredential
+
+
+class StorageManagementClientConfiguration:  # pylint: disable=too-many-instance-attributes
+    """Configuration for StorageManagementClient.
+
+    Note that all parameters used to create this instance are saved as instance
+    attributes.
+
+    :param credential: Credential needed for the client to connect to Azure. Required.
+    :type credential: ~azure.core.credentials.TokenCredential
+    :param subscription_id: The ID of the target subscription. Required.
+    :type subscription_id: str
+    :keyword api_version: Api Version. Default value is "2024-01-01". Note that overriding this
+     default value may result in unsupported behavior.
+    :paramtype api_version: str
+    """
+
+    def __init__(self, credential: "TokenCredential", subscription_id: str, **kwargs: Any) -> None:
+        api_version: str = kwargs.pop("api_version", "2024-01-01")
+
+        if credential is None:
+            raise ValueError("Parameter 'credential' must not be None.")
+        if subscription_id is None:
+            raise ValueError("Parameter 'subscription_id' must not be None.")
+
+        self.credential = credential
+        self.subscription_id = subscription_id
+        self.api_version = api_version
+        self.credential_scopes = kwargs.pop("credential_scopes", ["https://management.azure.com/.default"])
+        kwargs.setdefault("sdk_moniker", "mgmt-storage/{}".format(VERSION))
+        self.polling_interval = kwargs.get("polling_interval", 30)
+        self._configure(**kwargs)
+
+    def _configure(self, **kwargs: Any) -> None:
+        self.user_agent_policy = kwargs.get("user_agent_policy") or policies.UserAgentPolicy(**kwargs)
+        self.headers_policy = kwargs.get("headers_policy") or policies.HeadersPolicy(**kwargs)
+        self.proxy_policy = kwargs.get("proxy_policy") or policies.ProxyPolicy(**kwargs)
+        self.logging_policy = kwargs.get("logging_policy") or policies.NetworkTraceLoggingPolicy(**kwargs)
+        self.http_logging_policy = kwargs.get("http_logging_policy") or ARMHttpLoggingPolicy(**kwargs)
+        self.custom_hook_policy = kwargs.get("custom_hook_policy") or policies.CustomHookPolicy(**kwargs)
+        self.redirect_policy = kwargs.get("redirect_policy") or policies.RedirectPolicy(**kwargs)
+        self.retry_policy = kwargs.get("retry_policy") or policies.RetryPolicy(**kwargs)
+        self.authentication_policy = kwargs.get("authentication_policy")
+        if self.credential and not self.authentication_policy:
+            self.authentication_policy = ARMChallengeAuthenticationPolicy(
+                self.credential, *self.credential_scopes, **kwargs
+            )
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/_metadata.json b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/_metadata.json
new file mode 100644
index 000000000000..652cd062ecca
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/_metadata.json
@@ -0,0 +1,133 @@
+{
+    "chosen_version": "2024-01-01",
+    "total_api_version_list": ["2024-01-01"],
+    "client": {
+        "name": "StorageManagementClient",
+        "filename": "_storage_management_client",
+        "description": "The Azure Storage Management API.",
+        "host_value": "\"https://management.azure.com\"",
+        "parameterized_host_template": null,
+        "azure_arm": true,
+        "has_public_lro_operations": true,
+        "client_side_validation": false,
+        "sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"ARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementClientConfiguration\"], \".._serialization\": [\"Deserializer\", \"Serializer\"]}, \"stdlib\": {\"typing_extensions\": [\"Self\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}}",
+        "async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}, \"regular\": {\"sdkcore\": {\"azure.mgmt.core\": [\"AsyncARMPipelineClient\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"AsyncARMAutoResourceProviderRegistrationPolicy\"], \"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"]}, \"local\": {\"._configuration\": [\"StorageManagementClientConfiguration\"], \"..._serialization\": [\"Deserializer\", \"Serializer\"]}, \"stdlib\": {\"typing_extensions\": [\"Self\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"]}}}"
+    },
+    "global_parameters": {
+        "sync": {
+            "credential": {
+                "signature": "credential: \"TokenCredential\",",
+                "description": "Credential needed for the client to connect to Azure. Required.",
+                "docstring_type": "~azure.core.credentials.TokenCredential",
+                "required": true,
+                "method_location": "positional"
+            },
+            "subscription_id": {
+                "signature": "subscription_id: str,",
+                "description": "The ID of the target subscription. Required.",
+                "docstring_type": "str",
+                "required": true,
+                "method_location": "positional"
+            }
+        },
+        "async": {
+            "credential": {
+                "signature": "credential: \"AsyncTokenCredential\",",
+                "description": "Credential needed for the client to connect to Azure. Required.",
+                "docstring_type": "~azure.core.credentials_async.AsyncTokenCredential",
+                "required": true
+            },
+            "subscription_id": {
+                "signature": "subscription_id: str,",
+                "description": "The ID of the target subscription. Required.",
+                "docstring_type": "str",
+                "required": true
+            }
+        },
+        "constant": {
+        },
+        "call": "credential, subscription_id",
+        "service_client_specific": {
+            "sync": {
+                "api_version": {
+                    "signature": "api_version: Optional[str]=None,",
+                    "description": "API version to use if no profile is provided, or if missing in profile.",
+                    "docstring_type": "str",
+                    "required": false,
+                    "method_location": "positional"
+                },
+                "base_url": {
+                    "signature": "base_url: str = \"https://management.azure.com\",",
+                    "description": "Service URL",
+                    "docstring_type": "str",
+                    "required": false,
+                    "method_location": "positional"
+                },
+                "profile": {
+                    "signature": "profile: KnownProfiles=KnownProfiles.default,",
+                    "description": "A profile definition, from KnownProfiles to dict.",
+                    "docstring_type": "azure.profiles.KnownProfiles",
+                    "required": false,
+                    "method_location": "positional"
+                }
+            },
+            "async": {
+                "api_version": {
+                    "signature": "api_version: Optional[str] = None,",
+                    "description": "API version to use if no profile is provided, or if missing in profile.",
+                    "docstring_type": "str",
+                    "required": false,
+                    "method_location": "positional"
+                },
+                "base_url": {
+                    "signature": "base_url: str = \"https://management.azure.com\",",
+                    "description": "Service URL",
+                    "docstring_type": "str",
+                    "required": false,
+                    "method_location": "positional"
+                },
+                "profile": {
+                    "signature": "profile: KnownProfiles = KnownProfiles.default,",
+                    "description": "A profile definition, from KnownProfiles to dict.",
+                    "docstring_type": "azure.profiles.KnownProfiles",
+                    "required": false,
+                    "method_location": "positional"
+                }
+            }
+        }
+    },
+    "config": {
+        "credential": true,
+        "credential_scopes": ["https://management.azure.com/.default"],
+        "credential_call_sync": "ARMChallengeAuthenticationPolicy(self.credential, *self.credential_scopes, **kwargs)",
+        "credential_call_async": "AsyncARMChallengeAuthenticationPolicy(self.credential, *self.credential_scopes, **kwargs)",
+        "sync_imports": "{\"regular\": {\"sdkcore\": {\"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMChallengeAuthenticationPolicy\", \"ARMHttpLoggingPolicy\"]}, \"local\": {\"._version\": [\"VERSION\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}}",
+        "async_imports": "{\"regular\": {\"sdkcore\": {\"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMHttpLoggingPolicy\", \"AsyncARMChallengeAuthenticationPolicy\"]}, \"local\": {\".._version\": [\"VERSION\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\"]}}, \"typing\": {\"sdkcore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"]}}}"
+    },
+    "operation_groups": {
+        "blob_services": "BlobServicesOperations",
+        "blob_containers": "BlobContainersOperations",
+        "file_services": "FileServicesOperations",
+        "file_shares": "FileSharesOperations",
+        "queue_services": "QueueServicesOperations",
+        "queue": "QueueOperations",
+        "operations": "Operations",
+        "skus": "SkusOperations",
+        "storage_accounts": "StorageAccountsOperations",
+        "deleted_accounts": "DeletedAccountsOperations",
+        "usages": "UsagesOperations",
+        "management_policies": "ManagementPoliciesOperations",
+        "blob_inventory_policies": "BlobInventoryPoliciesOperations",
+        "private_endpoint_connections": "PrivateEndpointConnectionsOperations",
+        "private_link_resources": "PrivateLinkResourcesOperations",
+        "object_replication_policies": "ObjectReplicationPoliciesOperations",
+        "local_users": "LocalUsersOperations",
+        "encryption_scopes": "EncryptionScopesOperations",
+        "table_services": "TableServicesOperations",
+        "table": "TableOperations",
+        "network_security_perimeter_configurations": "NetworkSecurityPerimeterConfigurationsOperations",
+        "storage_task_assignments": "StorageTaskAssignmentsOperations",
+        "storage_task_assignments_instances_report": "StorageTaskAssignmentsInstancesReportOperations",
+        "storage_task_assignment_instances_report": "StorageTaskAssignmentInstancesReportOperations"
+    }
+}
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/_patch.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/_patch.py
new file mode 100644
index 000000000000..f7dd32510333
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/_patch.py
@@ -0,0 +1,20 @@
+# ------------------------------------
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+# ------------------------------------
+"""Customize generated code here.
+
+Follow our quickstart for examples: https://aka.ms/azsdk/python/dpcodegen/python/customize
+"""
+from typing import List
+
+__all__: List[str] = []  # Add all objects you want publicly available to users at this package level
+
+
+def patch_sdk():
+    """Do not remove from this file.
+
+    `patch_sdk` is a last resort escape hatch that allows you to do customizations
+    you can't accomplish using the techniques described in
+    https://aka.ms/azsdk/python/dpcodegen/python/customize
+    """
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/_storage_management_client.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/_storage_management_client.py
new file mode 100644
index 000000000000..f7a227d374fa
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/_storage_management_client.py
@@ -0,0 +1,256 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+
+from copy import deepcopy
+from typing import Any, TYPE_CHECKING
+from typing_extensions import Self
+
+from azure.core.pipeline import policies
+from azure.core.rest import HttpRequest, HttpResponse
+from azure.mgmt.core import ARMPipelineClient
+from azure.mgmt.core.policies import ARMAutoResourceProviderRegistrationPolicy
+
+from . import models as _models
+from .._serialization import Deserializer, Serializer
+from ._configuration import StorageManagementClientConfiguration
+from .operations import (
+    BlobContainersOperations,
+    BlobInventoryPoliciesOperations,
+    BlobServicesOperations,
+    DeletedAccountsOperations,
+    EncryptionScopesOperations,
+    FileServicesOperations,
+    FileSharesOperations,
+    LocalUsersOperations,
+    ManagementPoliciesOperations,
+    NetworkSecurityPerimeterConfigurationsOperations,
+    ObjectReplicationPoliciesOperations,
+    Operations,
+    PrivateEndpointConnectionsOperations,
+    PrivateLinkResourcesOperations,
+    QueueOperations,
+    QueueServicesOperations,
+    SkusOperations,
+    StorageAccountsOperations,
+    StorageTaskAssignmentInstancesReportOperations,
+    StorageTaskAssignmentsInstancesReportOperations,
+    StorageTaskAssignmentsOperations,
+    TableOperations,
+    TableServicesOperations,
+    UsagesOperations,
+)
+
+if TYPE_CHECKING:
+    from azure.core.credentials import TokenCredential
+
+
+class StorageManagementClient:  # pylint: disable=too-many-instance-attributes
+    """The Azure Storage Management API.
+
+    :ivar blob_services: BlobServicesOperations operations
+    :vartype blob_services: azure.mgmt.storage.v2024_01_01.operations.BlobServicesOperations
+    :ivar blob_containers: BlobContainersOperations operations
+    :vartype blob_containers: azure.mgmt.storage.v2024_01_01.operations.BlobContainersOperations
+    :ivar file_services: FileServicesOperations operations
+    :vartype file_services: azure.mgmt.storage.v2024_01_01.operations.FileServicesOperations
+    :ivar file_shares: FileSharesOperations operations
+    :vartype file_shares: azure.mgmt.storage.v2024_01_01.operations.FileSharesOperations
+    :ivar queue_services: QueueServicesOperations operations
+    :vartype queue_services: azure.mgmt.storage.v2024_01_01.operations.QueueServicesOperations
+    :ivar queue: QueueOperations operations
+    :vartype queue: azure.mgmt.storage.v2024_01_01.operations.QueueOperations
+    :ivar operations: Operations operations
+    :vartype operations: azure.mgmt.storage.v2024_01_01.operations.Operations
+    :ivar skus: SkusOperations operations
+    :vartype skus: azure.mgmt.storage.v2024_01_01.operations.SkusOperations
+    :ivar storage_accounts: StorageAccountsOperations operations
+    :vartype storage_accounts: azure.mgmt.storage.v2024_01_01.operations.StorageAccountsOperations
+    :ivar deleted_accounts: DeletedAccountsOperations operations
+    :vartype deleted_accounts: azure.mgmt.storage.v2024_01_01.operations.DeletedAccountsOperations
+    :ivar usages: UsagesOperations operations
+    :vartype usages: azure.mgmt.storage.v2024_01_01.operations.UsagesOperations
+    :ivar management_policies: ManagementPoliciesOperations operations
+    :vartype management_policies:
+     azure.mgmt.storage.v2024_01_01.operations.ManagementPoliciesOperations
+    :ivar blob_inventory_policies: BlobInventoryPoliciesOperations operations
+    :vartype blob_inventory_policies:
+     azure.mgmt.storage.v2024_01_01.operations.BlobInventoryPoliciesOperations
+    :ivar private_endpoint_connections: PrivateEndpointConnectionsOperations operations
+    :vartype private_endpoint_connections:
+     azure.mgmt.storage.v2024_01_01.operations.PrivateEndpointConnectionsOperations
+    :ivar private_link_resources: PrivateLinkResourcesOperations operations
+    :vartype private_link_resources:
+     azure.mgmt.storage.v2024_01_01.operations.PrivateLinkResourcesOperations
+    :ivar object_replication_policies: ObjectReplicationPoliciesOperations operations
+    :vartype object_replication_policies:
+     azure.mgmt.storage.v2024_01_01.operations.ObjectReplicationPoliciesOperations
+    :ivar local_users: LocalUsersOperations operations
+    :vartype local_users: azure.mgmt.storage.v2024_01_01.operations.LocalUsersOperations
+    :ivar encryption_scopes: EncryptionScopesOperations operations
+    :vartype encryption_scopes:
+     azure.mgmt.storage.v2024_01_01.operations.EncryptionScopesOperations
+    :ivar table_services: TableServicesOperations operations
+    :vartype table_services: azure.mgmt.storage.v2024_01_01.operations.TableServicesOperations
+    :ivar table: TableOperations operations
+    :vartype table: azure.mgmt.storage.v2024_01_01.operations.TableOperations
+    :ivar network_security_perimeter_configurations:
+     NetworkSecurityPerimeterConfigurationsOperations operations
+    :vartype network_security_perimeter_configurations:
+     azure.mgmt.storage.v2024_01_01.operations.NetworkSecurityPerimeterConfigurationsOperations
+    :ivar storage_task_assignments: StorageTaskAssignmentsOperations operations
+    :vartype storage_task_assignments:
+     azure.mgmt.storage.v2024_01_01.operations.StorageTaskAssignmentsOperations
+    :ivar storage_task_assignments_instances_report:
+     StorageTaskAssignmentsInstancesReportOperations operations
+    :vartype storage_task_assignments_instances_report:
+     azure.mgmt.storage.v2024_01_01.operations.StorageTaskAssignmentsInstancesReportOperations
+    :ivar storage_task_assignment_instances_report: StorageTaskAssignmentInstancesReportOperations
+     operations
+    :vartype storage_task_assignment_instances_report:
+     azure.mgmt.storage.v2024_01_01.operations.StorageTaskAssignmentInstancesReportOperations
+    :param credential: Credential needed for the client to connect to Azure. Required.
+    :type credential: ~azure.core.credentials.TokenCredential
+    :param subscription_id: The ID of the target subscription. Required.
+    :type subscription_id: str
+    :param base_url: Service URL. Default value is "https://management.azure.com".
+    :type base_url: str
+    :keyword api_version: Api Version. Default value is "2024-01-01". Note that overriding this
+     default value may result in unsupported behavior.
+    :paramtype api_version: str
+    :keyword int polling_interval: Default waiting time between two polls for LRO operations if no
+     Retry-After header is present.
+    """
+
+    def __init__(
+        self,
+        credential: "TokenCredential",
+        subscription_id: str,
+        base_url: str = "https://management.azure.com",
+        **kwargs: Any
+    ) -> None:
+        self._config = StorageManagementClientConfiguration(
+            credential=credential, subscription_id=subscription_id, **kwargs
+        )
+        _policies = kwargs.pop("policies", None)
+        if _policies is None:
+            _policies = [
+                policies.RequestIdPolicy(**kwargs),
+                self._config.headers_policy,
+                self._config.user_agent_policy,
+                self._config.proxy_policy,
+                policies.ContentDecodePolicy(**kwargs),
+                ARMAutoResourceProviderRegistrationPolicy(),
+                self._config.redirect_policy,
+                self._config.retry_policy,
+                self._config.authentication_policy,
+                self._config.custom_hook_policy,
+                self._config.logging_policy,
+                policies.DistributedTracingPolicy(**kwargs),
+                policies.SensitiveHeaderCleanupPolicy(**kwargs) if self._config.redirect_policy else None,
+                self._config.http_logging_policy,
+            ]
+        self._client: ARMPipelineClient = ARMPipelineClient(base_url=base_url, policies=_policies, **kwargs)
+
+        client_models = {k: v for k, v in _models.__dict__.items() if isinstance(v, type)}
+        self._serialize = Serializer(client_models)
+        self._deserialize = Deserializer(client_models)
+        self._serialize.client_side_validation = False
+        self.blob_services = BlobServicesOperations(
+            self._client, self._config, self._serialize, self._deserialize, "2024-01-01"
+        )
+        self.blob_containers = BlobContainersOperations(
+            self._client, self._config, self._serialize, self._deserialize, "2024-01-01"
+        )
+        self.file_services = FileServicesOperations(
+            self._client, self._config, self._serialize, self._deserialize, "2024-01-01"
+        )
+        self.file_shares = FileSharesOperations(
+            self._client, self._config, self._serialize, self._deserialize, "2024-01-01"
+        )
+        self.queue_services = QueueServicesOperations(
+            self._client, self._config, self._serialize, self._deserialize, "2024-01-01"
+        )
+        self.queue = QueueOperations(self._client, self._config, self._serialize, self._deserialize, "2024-01-01")
+        self.operations = Operations(self._client, self._config, self._serialize, self._deserialize, "2024-01-01")
+        self.skus = SkusOperations(self._client, self._config, self._serialize, self._deserialize, "2024-01-01")
+        self.storage_accounts = StorageAccountsOperations(
+            self._client, self._config, self._serialize, self._deserialize, "2024-01-01"
+        )
+        self.deleted_accounts = DeletedAccountsOperations(
+            self._client, self._config, self._serialize, self._deserialize, "2024-01-01"
+        )
+        self.usages = UsagesOperations(self._client, self._config, self._serialize, self._deserialize, "2024-01-01")
+        self.management_policies = ManagementPoliciesOperations(
+            self._client, self._config, self._serialize, self._deserialize, "2024-01-01"
+        )
+        self.blob_inventory_policies = BlobInventoryPoliciesOperations(
+            self._client, self._config, self._serialize, self._deserialize, "2024-01-01"
+        )
+        self.private_endpoint_connections = PrivateEndpointConnectionsOperations(
+            self._client, self._config, self._serialize, self._deserialize, "2024-01-01"
+        )
+        self.private_link_resources = PrivateLinkResourcesOperations(
+            self._client, self._config, self._serialize, self._deserialize, "2024-01-01"
+        )
+        self.object_replication_policies = ObjectReplicationPoliciesOperations(
+            self._client, self._config, self._serialize, self._deserialize, "2024-01-01"
+        )
+        self.local_users = LocalUsersOperations(
+            self._client, self._config, self._serialize, self._deserialize, "2024-01-01"
+        )
+        self.encryption_scopes = EncryptionScopesOperations(
+            self._client, self._config, self._serialize, self._deserialize, "2024-01-01"
+        )
+        self.table_services = TableServicesOperations(
+            self._client, self._config, self._serialize, self._deserialize, "2024-01-01"
+        )
+        self.table = TableOperations(self._client, self._config, self._serialize, self._deserialize, "2024-01-01")
+        self.network_security_perimeter_configurations = NetworkSecurityPerimeterConfigurationsOperations(
+            self._client, self._config, self._serialize, self._deserialize, "2024-01-01"
+        )
+        self.storage_task_assignments = StorageTaskAssignmentsOperations(
+            self._client, self._config, self._serialize, self._deserialize, "2024-01-01"
+        )
+        self.storage_task_assignments_instances_report = StorageTaskAssignmentsInstancesReportOperations(
+            self._client, self._config, self._serialize, self._deserialize, "2024-01-01"
+        )
+        self.storage_task_assignment_instances_report = StorageTaskAssignmentInstancesReportOperations(
+            self._client, self._config, self._serialize, self._deserialize, "2024-01-01"
+        )
+
+    def _send_request(self, request: HttpRequest, *, stream: bool = False, **kwargs: Any) -> HttpResponse:
+        """Runs the network request through the client's chained policies.
+
+        >>> from azure.core.rest import HttpRequest
+        >>> request = HttpRequest("GET", "https://www.example.org/")
+        <HttpRequest [GET], url: 'https://www.example.org/'>
+        >>> response = client._send_request(request)
+        <HttpResponse: 200 OK>
+
+        For more information on this code flow, see https://aka.ms/azsdk/dpcodegen/python/send_request
+
+        :param request: The network request you want to make. Required.
+        :type request: ~azure.core.rest.HttpRequest
+        :keyword bool stream: Whether the response payload will be streamed. Defaults to False.
+        :return: The response of your network call. Does not do error handling on your response.
+        :rtype: ~azure.core.rest.HttpResponse
+        """
+
+        request_copy = deepcopy(request)
+        request_copy.url = self._client.format_url(request_copy.url)
+        return self._client.send_request(request_copy, stream=stream, **kwargs)  # type: ignore
+
+    def close(self) -> None:
+        self._client.close()
+
+    def __enter__(self) -> Self:
+        self._client.__enter__()
+        return self
+
+    def __exit__(self, *exc_details: Any) -> None:
+        self._client.__exit__(*exc_details)
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2015_06_15/_vendor.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/_version.py
similarity index 58%
rename from sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2015_06_15/_vendor.py
rename to sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/_version.py
index 0dafe0e287ff..e5754a47ce68 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2015_06_15/_vendor.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/_version.py
@@ -1,3 +1,4 @@
+# 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.
@@ -5,12 +6,4 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from azure.core.pipeline.transport import HttpRequest
-
-
-def _convert_request(request, files=None):
-    data = request.content if not files else None
-    request = HttpRequest(method=request.method, url=request.url, headers=request.headers, data=data)
-    if files:
-        request.set_formdata_body(files)
-    return request
+VERSION = "1.0.0b1"
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/__init__.py
new file mode 100644
index 000000000000..ee2b940bd4fc
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/__init__.py
@@ -0,0 +1,29 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+# pylint: disable=wrong-import-position
+
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._storage_management_client import StorageManagementClient  # type: ignore
+
+try:
+    from ._patch import __all__ as _patch_all
+    from ._patch import *
+except ImportError:
+    _patch_all = []
+from ._patch import patch_sdk as _patch_sdk
+
+__all__ = [
+    "StorageManagementClient",
+]
+__all__.extend([p for p in _patch_all if p not in __all__])  # pyright: ignore
+
+_patch_sdk()
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/_configuration.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/_configuration.py
new file mode 100644
index 000000000000..f5f277521e4b
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/_configuration.py
@@ -0,0 +1,64 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+
+from typing import Any, TYPE_CHECKING
+
+from azure.core.pipeline import policies
+from azure.mgmt.core.policies import ARMHttpLoggingPolicy, AsyncARMChallengeAuthenticationPolicy
+
+from .._version import VERSION
+
+if TYPE_CHECKING:
+    from azure.core.credentials_async import AsyncTokenCredential
+
+
+class StorageManagementClientConfiguration:  # pylint: disable=too-many-instance-attributes
+    """Configuration for StorageManagementClient.
+
+    Note that all parameters used to create this instance are saved as instance
+    attributes.
+
+    :param credential: Credential needed for the client to connect to Azure. Required.
+    :type credential: ~azure.core.credentials_async.AsyncTokenCredential
+    :param subscription_id: The ID of the target subscription. Required.
+    :type subscription_id: str
+    :keyword api_version: Api Version. Default value is "2024-01-01". Note that overriding this
+     default value may result in unsupported behavior.
+    :paramtype api_version: str
+    """
+
+    def __init__(self, credential: "AsyncTokenCredential", subscription_id: str, **kwargs: Any) -> None:
+        api_version: str = kwargs.pop("api_version", "2024-01-01")
+
+        if credential is None:
+            raise ValueError("Parameter 'credential' must not be None.")
+        if subscription_id is None:
+            raise ValueError("Parameter 'subscription_id' must not be None.")
+
+        self.credential = credential
+        self.subscription_id = subscription_id
+        self.api_version = api_version
+        self.credential_scopes = kwargs.pop("credential_scopes", ["https://management.azure.com/.default"])
+        kwargs.setdefault("sdk_moniker", "mgmt-storage/{}".format(VERSION))
+        self.polling_interval = kwargs.get("polling_interval", 30)
+        self._configure(**kwargs)
+
+    def _configure(self, **kwargs: Any) -> None:
+        self.user_agent_policy = kwargs.get("user_agent_policy") or policies.UserAgentPolicy(**kwargs)
+        self.headers_policy = kwargs.get("headers_policy") or policies.HeadersPolicy(**kwargs)
+        self.proxy_policy = kwargs.get("proxy_policy") or policies.ProxyPolicy(**kwargs)
+        self.logging_policy = kwargs.get("logging_policy") or policies.NetworkTraceLoggingPolicy(**kwargs)
+        self.http_logging_policy = kwargs.get("http_logging_policy") or ARMHttpLoggingPolicy(**kwargs)
+        self.custom_hook_policy = kwargs.get("custom_hook_policy") or policies.CustomHookPolicy(**kwargs)
+        self.redirect_policy = kwargs.get("redirect_policy") or policies.AsyncRedirectPolicy(**kwargs)
+        self.retry_policy = kwargs.get("retry_policy") or policies.AsyncRetryPolicy(**kwargs)
+        self.authentication_policy = kwargs.get("authentication_policy")
+        if self.credential and not self.authentication_policy:
+            self.authentication_policy = AsyncARMChallengeAuthenticationPolicy(
+                self.credential, *self.credential_scopes, **kwargs
+            )
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/_patch.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/_patch.py
new file mode 100644
index 000000000000..f7dd32510333
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/_patch.py
@@ -0,0 +1,20 @@
+# ------------------------------------
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+# ------------------------------------
+"""Customize generated code here.
+
+Follow our quickstart for examples: https://aka.ms/azsdk/python/dpcodegen/python/customize
+"""
+from typing import List
+
+__all__: List[str] = []  # Add all objects you want publicly available to users at this package level
+
+
+def patch_sdk():
+    """Do not remove from this file.
+
+    `patch_sdk` is a last resort escape hatch that allows you to do customizations
+    you can't accomplish using the techniques described in
+    https://aka.ms/azsdk/python/dpcodegen/python/customize
+    """
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/_storage_management_client.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/_storage_management_client.py
new file mode 100644
index 000000000000..50641ab8cba5
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/_storage_management_client.py
@@ -0,0 +1,261 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+
+from copy import deepcopy
+from typing import Any, Awaitable, TYPE_CHECKING
+from typing_extensions import Self
+
+from azure.core.pipeline import policies
+from azure.core.rest import AsyncHttpResponse, HttpRequest
+from azure.mgmt.core import AsyncARMPipelineClient
+from azure.mgmt.core.policies import AsyncARMAutoResourceProviderRegistrationPolicy
+
+from .. import models as _models
+from ..._serialization import Deserializer, Serializer
+from ._configuration import StorageManagementClientConfiguration
+from .operations import (
+    BlobContainersOperations,
+    BlobInventoryPoliciesOperations,
+    BlobServicesOperations,
+    DeletedAccountsOperations,
+    EncryptionScopesOperations,
+    FileServicesOperations,
+    FileSharesOperations,
+    LocalUsersOperations,
+    ManagementPoliciesOperations,
+    NetworkSecurityPerimeterConfigurationsOperations,
+    ObjectReplicationPoliciesOperations,
+    Operations,
+    PrivateEndpointConnectionsOperations,
+    PrivateLinkResourcesOperations,
+    QueueOperations,
+    QueueServicesOperations,
+    SkusOperations,
+    StorageAccountsOperations,
+    StorageTaskAssignmentInstancesReportOperations,
+    StorageTaskAssignmentsInstancesReportOperations,
+    StorageTaskAssignmentsOperations,
+    TableOperations,
+    TableServicesOperations,
+    UsagesOperations,
+)
+
+if TYPE_CHECKING:
+    from azure.core.credentials_async import AsyncTokenCredential
+
+
+class StorageManagementClient:  # pylint: disable=too-many-instance-attributes
+    """The Azure Storage Management API.
+
+    :ivar blob_services: BlobServicesOperations operations
+    :vartype blob_services: azure.mgmt.storage.v2024_01_01.aio.operations.BlobServicesOperations
+    :ivar blob_containers: BlobContainersOperations operations
+    :vartype blob_containers:
+     azure.mgmt.storage.v2024_01_01.aio.operations.BlobContainersOperations
+    :ivar file_services: FileServicesOperations operations
+    :vartype file_services: azure.mgmt.storage.v2024_01_01.aio.operations.FileServicesOperations
+    :ivar file_shares: FileSharesOperations operations
+    :vartype file_shares: azure.mgmt.storage.v2024_01_01.aio.operations.FileSharesOperations
+    :ivar queue_services: QueueServicesOperations operations
+    :vartype queue_services: azure.mgmt.storage.v2024_01_01.aio.operations.QueueServicesOperations
+    :ivar queue: QueueOperations operations
+    :vartype queue: azure.mgmt.storage.v2024_01_01.aio.operations.QueueOperations
+    :ivar operations: Operations operations
+    :vartype operations: azure.mgmt.storage.v2024_01_01.aio.operations.Operations
+    :ivar skus: SkusOperations operations
+    :vartype skus: azure.mgmt.storage.v2024_01_01.aio.operations.SkusOperations
+    :ivar storage_accounts: StorageAccountsOperations operations
+    :vartype storage_accounts:
+     azure.mgmt.storage.v2024_01_01.aio.operations.StorageAccountsOperations
+    :ivar deleted_accounts: DeletedAccountsOperations operations
+    :vartype deleted_accounts:
+     azure.mgmt.storage.v2024_01_01.aio.operations.DeletedAccountsOperations
+    :ivar usages: UsagesOperations operations
+    :vartype usages: azure.mgmt.storage.v2024_01_01.aio.operations.UsagesOperations
+    :ivar management_policies: ManagementPoliciesOperations operations
+    :vartype management_policies:
+     azure.mgmt.storage.v2024_01_01.aio.operations.ManagementPoliciesOperations
+    :ivar blob_inventory_policies: BlobInventoryPoliciesOperations operations
+    :vartype blob_inventory_policies:
+     azure.mgmt.storage.v2024_01_01.aio.operations.BlobInventoryPoliciesOperations
+    :ivar private_endpoint_connections: PrivateEndpointConnectionsOperations operations
+    :vartype private_endpoint_connections:
+     azure.mgmt.storage.v2024_01_01.aio.operations.PrivateEndpointConnectionsOperations
+    :ivar private_link_resources: PrivateLinkResourcesOperations operations
+    :vartype private_link_resources:
+     azure.mgmt.storage.v2024_01_01.aio.operations.PrivateLinkResourcesOperations
+    :ivar object_replication_policies: ObjectReplicationPoliciesOperations operations
+    :vartype object_replication_policies:
+     azure.mgmt.storage.v2024_01_01.aio.operations.ObjectReplicationPoliciesOperations
+    :ivar local_users: LocalUsersOperations operations
+    :vartype local_users: azure.mgmt.storage.v2024_01_01.aio.operations.LocalUsersOperations
+    :ivar encryption_scopes: EncryptionScopesOperations operations
+    :vartype encryption_scopes:
+     azure.mgmt.storage.v2024_01_01.aio.operations.EncryptionScopesOperations
+    :ivar table_services: TableServicesOperations operations
+    :vartype table_services: azure.mgmt.storage.v2024_01_01.aio.operations.TableServicesOperations
+    :ivar table: TableOperations operations
+    :vartype table: azure.mgmt.storage.v2024_01_01.aio.operations.TableOperations
+    :ivar network_security_perimeter_configurations:
+     NetworkSecurityPerimeterConfigurationsOperations operations
+    :vartype network_security_perimeter_configurations:
+     azure.mgmt.storage.v2024_01_01.aio.operations.NetworkSecurityPerimeterConfigurationsOperations
+    :ivar storage_task_assignments: StorageTaskAssignmentsOperations operations
+    :vartype storage_task_assignments:
+     azure.mgmt.storage.v2024_01_01.aio.operations.StorageTaskAssignmentsOperations
+    :ivar storage_task_assignments_instances_report:
+     StorageTaskAssignmentsInstancesReportOperations operations
+    :vartype storage_task_assignments_instances_report:
+     azure.mgmt.storage.v2024_01_01.aio.operations.StorageTaskAssignmentsInstancesReportOperations
+    :ivar storage_task_assignment_instances_report: StorageTaskAssignmentInstancesReportOperations
+     operations
+    :vartype storage_task_assignment_instances_report:
+     azure.mgmt.storage.v2024_01_01.aio.operations.StorageTaskAssignmentInstancesReportOperations
+    :param credential: Credential needed for the client to connect to Azure. Required.
+    :type credential: ~azure.core.credentials_async.AsyncTokenCredential
+    :param subscription_id: The ID of the target subscription. Required.
+    :type subscription_id: str
+    :param base_url: Service URL. Default value is "https://management.azure.com".
+    :type base_url: str
+    :keyword api_version: Api Version. Default value is "2024-01-01". Note that overriding this
+     default value may result in unsupported behavior.
+    :paramtype api_version: str
+    :keyword int polling_interval: Default waiting time between two polls for LRO operations if no
+     Retry-After header is present.
+    """
+
+    def __init__(
+        self,
+        credential: "AsyncTokenCredential",
+        subscription_id: str,
+        base_url: str = "https://management.azure.com",
+        **kwargs: Any
+    ) -> None:
+        self._config = StorageManagementClientConfiguration(
+            credential=credential, subscription_id=subscription_id, **kwargs
+        )
+        _policies = kwargs.pop("policies", None)
+        if _policies is None:
+            _policies = [
+                policies.RequestIdPolicy(**kwargs),
+                self._config.headers_policy,
+                self._config.user_agent_policy,
+                self._config.proxy_policy,
+                policies.ContentDecodePolicy(**kwargs),
+                AsyncARMAutoResourceProviderRegistrationPolicy(),
+                self._config.redirect_policy,
+                self._config.retry_policy,
+                self._config.authentication_policy,
+                self._config.custom_hook_policy,
+                self._config.logging_policy,
+                policies.DistributedTracingPolicy(**kwargs),
+                policies.SensitiveHeaderCleanupPolicy(**kwargs) if self._config.redirect_policy else None,
+                self._config.http_logging_policy,
+            ]
+        self._client: AsyncARMPipelineClient = AsyncARMPipelineClient(base_url=base_url, policies=_policies, **kwargs)
+
+        client_models = {k: v for k, v in _models.__dict__.items() if isinstance(v, type)}
+        self._serialize = Serializer(client_models)
+        self._deserialize = Deserializer(client_models)
+        self._serialize.client_side_validation = False
+        self.blob_services = BlobServicesOperations(
+            self._client, self._config, self._serialize, self._deserialize, "2024-01-01"
+        )
+        self.blob_containers = BlobContainersOperations(
+            self._client, self._config, self._serialize, self._deserialize, "2024-01-01"
+        )
+        self.file_services = FileServicesOperations(
+            self._client, self._config, self._serialize, self._deserialize, "2024-01-01"
+        )
+        self.file_shares = FileSharesOperations(
+            self._client, self._config, self._serialize, self._deserialize, "2024-01-01"
+        )
+        self.queue_services = QueueServicesOperations(
+            self._client, self._config, self._serialize, self._deserialize, "2024-01-01"
+        )
+        self.queue = QueueOperations(self._client, self._config, self._serialize, self._deserialize, "2024-01-01")
+        self.operations = Operations(self._client, self._config, self._serialize, self._deserialize, "2024-01-01")
+        self.skus = SkusOperations(self._client, self._config, self._serialize, self._deserialize, "2024-01-01")
+        self.storage_accounts = StorageAccountsOperations(
+            self._client, self._config, self._serialize, self._deserialize, "2024-01-01"
+        )
+        self.deleted_accounts = DeletedAccountsOperations(
+            self._client, self._config, self._serialize, self._deserialize, "2024-01-01"
+        )
+        self.usages = UsagesOperations(self._client, self._config, self._serialize, self._deserialize, "2024-01-01")
+        self.management_policies = ManagementPoliciesOperations(
+            self._client, self._config, self._serialize, self._deserialize, "2024-01-01"
+        )
+        self.blob_inventory_policies = BlobInventoryPoliciesOperations(
+            self._client, self._config, self._serialize, self._deserialize, "2024-01-01"
+        )
+        self.private_endpoint_connections = PrivateEndpointConnectionsOperations(
+            self._client, self._config, self._serialize, self._deserialize, "2024-01-01"
+        )
+        self.private_link_resources = PrivateLinkResourcesOperations(
+            self._client, self._config, self._serialize, self._deserialize, "2024-01-01"
+        )
+        self.object_replication_policies = ObjectReplicationPoliciesOperations(
+            self._client, self._config, self._serialize, self._deserialize, "2024-01-01"
+        )
+        self.local_users = LocalUsersOperations(
+            self._client, self._config, self._serialize, self._deserialize, "2024-01-01"
+        )
+        self.encryption_scopes = EncryptionScopesOperations(
+            self._client, self._config, self._serialize, self._deserialize, "2024-01-01"
+        )
+        self.table_services = TableServicesOperations(
+            self._client, self._config, self._serialize, self._deserialize, "2024-01-01"
+        )
+        self.table = TableOperations(self._client, self._config, self._serialize, self._deserialize, "2024-01-01")
+        self.network_security_perimeter_configurations = NetworkSecurityPerimeterConfigurationsOperations(
+            self._client, self._config, self._serialize, self._deserialize, "2024-01-01"
+        )
+        self.storage_task_assignments = StorageTaskAssignmentsOperations(
+            self._client, self._config, self._serialize, self._deserialize, "2024-01-01"
+        )
+        self.storage_task_assignments_instances_report = StorageTaskAssignmentsInstancesReportOperations(
+            self._client, self._config, self._serialize, self._deserialize, "2024-01-01"
+        )
+        self.storage_task_assignment_instances_report = StorageTaskAssignmentInstancesReportOperations(
+            self._client, self._config, self._serialize, self._deserialize, "2024-01-01"
+        )
+
+    def _send_request(
+        self, request: HttpRequest, *, stream: bool = False, **kwargs: Any
+    ) -> Awaitable[AsyncHttpResponse]:
+        """Runs the network request through the client's chained policies.
+
+        >>> from azure.core.rest import HttpRequest
+        >>> request = HttpRequest("GET", "https://www.example.org/")
+        <HttpRequest [GET], url: 'https://www.example.org/'>
+        >>> response = await client._send_request(request)
+        <AsyncHttpResponse: 200 OK>
+
+        For more information on this code flow, see https://aka.ms/azsdk/dpcodegen/python/send_request
+
+        :param request: The network request you want to make. Required.
+        :type request: ~azure.core.rest.HttpRequest
+        :keyword bool stream: Whether the response payload will be streamed. Defaults to False.
+        :return: The response of your network call. Does not do error handling on your response.
+        :rtype: ~azure.core.rest.AsyncHttpResponse
+        """
+
+        request_copy = deepcopy(request)
+        request_copy.url = self._client.format_url(request_copy.url)
+        return self._client.send_request(request_copy, stream=stream, **kwargs)  # type: ignore
+
+    async def close(self) -> None:
+        await self._client.close()
+
+    async def __aenter__(self) -> Self:
+        await self._client.__aenter__()
+        return self
+
+    async def __aexit__(self, *exc_details: Any) -> None:
+        await self._client.__aexit__(*exc_details)
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/operations/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/operations/__init__.py
new file mode 100644
index 000000000000..18334b99b3ea
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/operations/__init__.py
@@ -0,0 +1,71 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+# pylint: disable=wrong-import-position
+
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._blob_services_operations import BlobServicesOperations  # type: ignore
+from ._blob_containers_operations import BlobContainersOperations  # type: ignore
+from ._file_services_operations import FileServicesOperations  # type: ignore
+from ._file_shares_operations import FileSharesOperations  # type: ignore
+from ._queue_services_operations import QueueServicesOperations  # type: ignore
+from ._queue_operations import QueueOperations  # type: ignore
+from ._operations import Operations  # type: ignore
+from ._skus_operations import SkusOperations  # type: ignore
+from ._storage_accounts_operations import StorageAccountsOperations  # type: ignore
+from ._deleted_accounts_operations import DeletedAccountsOperations  # type: ignore
+from ._usages_operations import UsagesOperations  # type: ignore
+from ._management_policies_operations import ManagementPoliciesOperations  # type: ignore
+from ._blob_inventory_policies_operations import BlobInventoryPoliciesOperations  # type: ignore
+from ._private_endpoint_connections_operations import PrivateEndpointConnectionsOperations  # type: ignore
+from ._private_link_resources_operations import PrivateLinkResourcesOperations  # type: ignore
+from ._object_replication_policies_operations import ObjectReplicationPoliciesOperations  # type: ignore
+from ._local_users_operations import LocalUsersOperations  # type: ignore
+from ._encryption_scopes_operations import EncryptionScopesOperations  # type: ignore
+from ._table_services_operations import TableServicesOperations  # type: ignore
+from ._table_operations import TableOperations  # type: ignore
+from ._network_security_perimeter_configurations_operations import NetworkSecurityPerimeterConfigurationsOperations  # type: ignore
+from ._storage_task_assignments_operations import StorageTaskAssignmentsOperations  # type: ignore
+from ._storage_task_assignments_instances_report_operations import StorageTaskAssignmentsInstancesReportOperations  # type: ignore
+from ._storage_task_assignment_instances_report_operations import StorageTaskAssignmentInstancesReportOperations  # type: ignore
+
+from ._patch import __all__ as _patch_all
+from ._patch import *
+from ._patch import patch_sdk as _patch_sdk
+
+__all__ = [
+    "BlobServicesOperations",
+    "BlobContainersOperations",
+    "FileServicesOperations",
+    "FileSharesOperations",
+    "QueueServicesOperations",
+    "QueueOperations",
+    "Operations",
+    "SkusOperations",
+    "StorageAccountsOperations",
+    "DeletedAccountsOperations",
+    "UsagesOperations",
+    "ManagementPoliciesOperations",
+    "BlobInventoryPoliciesOperations",
+    "PrivateEndpointConnectionsOperations",
+    "PrivateLinkResourcesOperations",
+    "ObjectReplicationPoliciesOperations",
+    "LocalUsersOperations",
+    "EncryptionScopesOperations",
+    "TableServicesOperations",
+    "TableOperations",
+    "NetworkSecurityPerimeterConfigurationsOperations",
+    "StorageTaskAssignmentsOperations",
+    "StorageTaskAssignmentsInstancesReportOperations",
+    "StorageTaskAssignmentInstancesReportOperations",
+]
+__all__.extend([p for p in _patch_all if p not in __all__])  # pyright: ignore
+_patch_sdk()
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/operations/_blob_containers_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/operations/_blob_containers_operations.py
new file mode 100644
index 000000000000..50d8113dba12
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/operations/_blob_containers_operations.py
@@ -0,0 +1,1840 @@
+# 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.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+from io import IOBase
+import sys
+from typing import (
+    Any,
+    AsyncIterable,
+    AsyncIterator,
+    Callable,
+    Dict,
+    IO,
+    Literal,
+    Optional,
+    TypeVar,
+    Union,
+    cast,
+    overload,
+)
+import urllib.parse
+
+from azure.core.async_paging import AsyncItemPaged, AsyncList
+from azure.core.exceptions import (
+    ClientAuthenticationError,
+    HttpResponseError,
+    ResourceExistsError,
+    ResourceNotFoundError,
+    ResourceNotModifiedError,
+    StreamClosedError,
+    StreamConsumedError,
+    map_error,
+)
+from azure.core.pipeline import PipelineResponse
+from azure.core.polling import AsyncLROPoller, AsyncNoPolling, AsyncPollingMethod
+from azure.core.rest import AsyncHttpResponse, HttpRequest
+from azure.core.tracing.decorator import distributed_trace
+from azure.core.tracing.decorator_async import distributed_trace_async
+from azure.core.utils import case_insensitive_dict
+from azure.mgmt.core.exceptions import ARMErrorFormat
+from azure.mgmt.core.polling.async_arm_polling import AsyncARMPolling
+
+from ... import models as _models
+from ...operations._blob_containers_operations import (
+    build_clear_legal_hold_request,
+    build_create_or_update_immutability_policy_request,
+    build_create_request,
+    build_delete_immutability_policy_request,
+    build_delete_request,
+    build_extend_immutability_policy_request,
+    build_get_immutability_policy_request,
+    build_get_request,
+    build_lease_request,
+    build_list_request,
+    build_lock_immutability_policy_request,
+    build_object_level_worm_request,
+    build_set_legal_hold_request,
+    build_update_request,
+)
+
+if sys.version_info >= (3, 9):
+    from collections.abc import MutableMapping
+else:
+    from typing import MutableMapping  # type: ignore
+T = TypeVar("T")
+ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
+
+
+class BlobContainersOperations:
+    """
+    .. warning::
+        **DO NOT** instantiate this class directly.
+
+        Instead, you should access the following operations through
+        :class:`~azure.mgmt.storage.v2024_01_01.aio.StorageManagementClient`'s
+        :attr:`blob_containers` attribute.
+    """
+
+    models = _models
+
+    def __init__(self, *args, **kwargs) -> None:
+        input_args = list(args)
+        self._client = input_args.pop(0) if input_args else kwargs.pop("client")
+        self._config = input_args.pop(0) if input_args else kwargs.pop("config")
+        self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer")
+        self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer")
+        self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version")
+
+    @distributed_trace
+    def list(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        maxpagesize: Optional[str] = None,
+        filter: Optional[str] = None,
+        include: Optional[Union[str, _models.ListContainersInclude]] = None,
+        **kwargs: Any
+    ) -> AsyncIterable["_models.ListContainerItem"]:
+        """Lists all containers and does not support a prefix like data plane. Also SRP today does not
+        return continuation token.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param maxpagesize: Optional. Specified maximum number of containers that can be included in
+         the list. Default value is None.
+        :type maxpagesize: str
+        :param filter: Optional. When specified, only container names starting with the filter will be
+         listed. Default value is None.
+        :type filter: str
+        :param include: Optional, used to include the properties for soft deleted blob containers.
+         "deleted" Default value is None.
+        :type include: str or ~azure.mgmt.storage.v2024_01_01.models.ListContainersInclude
+        :return: An iterator like instance of either ListContainerItem or the result of cls(response)
+        :rtype:
+         ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.storage.v2024_01_01.models.ListContainerItem]
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.ListContainerItems] = kwargs.pop("cls", None)
+
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        def prepare_request(next_link=None):
+            if not next_link:
+
+                _request = build_list_request(
+                    resource_group_name=resource_group_name,
+                    account_name=account_name,
+                    subscription_id=self._config.subscription_id,
+                    maxpagesize=maxpagesize,
+                    filter=filter,
+                    include=include,
+                    api_version=api_version,
+                    headers=_headers,
+                    params=_params,
+                )
+                _request.url = self._client.format_url(_request.url)
+
+            else:
+                # make call to next link with the client's api-version
+                _parsed_next_link = urllib.parse.urlparse(next_link)
+                _next_request_params = case_insensitive_dict(
+                    {
+                        key: [urllib.parse.quote(v) for v in value]
+                        for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items()
+                    }
+                )
+                _next_request_params["api-version"] = self._api_version
+                _request = HttpRequest(
+                    "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
+                )
+                _request.url = self._client.format_url(_request.url)
+                _request.method = "GET"
+            return _request
+
+        async def extract_data(pipeline_response):
+            deserialized = self._deserialize("ListContainerItems", pipeline_response)
+            list_of_elem = deserialized.value
+            if cls:
+                list_of_elem = cls(list_of_elem)  # type: ignore
+            return deserialized.next_link or None, AsyncList(list_of_elem)
+
+        async def get_next(next_link=None):
+            _request = prepare_request(next_link)
+
+            _stream = False
+            pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+                _request, stream=_stream, **kwargs
+            )
+            response = pipeline_response.http_response
+
+            if response.status_code not in [200]:
+                map_error(status_code=response.status_code, response=response, error_map=error_map)
+                raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+            return pipeline_response
+
+        return AsyncItemPaged(get_next, extract_data)
+
+    @overload
+    async def create(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        container_name: str,
+        blob_container: _models.BlobContainer,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.BlobContainer:
+        """Creates a new container under the specified account as described by request body. The container
+        resource includes metadata and properties for that container. It does not include a list of the
+        blobs contained by the container.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param container_name: The name of the blob container within the specified storage account.
+         Blob container names must be between 3 and 63 characters in length and use numbers, lower-case
+         letters and dash (-) only. Every dash (-) character must be immediately preceded and followed
+         by a letter or number. Required.
+        :type container_name: str
+        :param blob_container: Properties of the blob container to create. Required.
+        :type blob_container: ~azure.mgmt.storage.v2024_01_01.models.BlobContainer
+        :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: BlobContainer or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.BlobContainer
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @overload
+    async def create(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        container_name: str,
+        blob_container: IO[bytes],
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.BlobContainer:
+        """Creates a new container under the specified account as described by request body. The container
+        resource includes metadata and properties for that container. It does not include a list of the
+        blobs contained by the container.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param container_name: The name of the blob container within the specified storage account.
+         Blob container names must be between 3 and 63 characters in length and use numbers, lower-case
+         letters and dash (-) only. Every dash (-) character must be immediately preceded and followed
+         by a letter or number. Required.
+        :type container_name: str
+        :param blob_container: Properties of the blob container to create. Required.
+        :type blob_container: IO[bytes]
+        :keyword content_type: Body Parameter content-type. Content type parameter for binary body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: BlobContainer or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.BlobContainer
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @distributed_trace_async
+    async def create(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        container_name: str,
+        blob_container: Union[_models.BlobContainer, IO[bytes]],
+        **kwargs: Any
+    ) -> _models.BlobContainer:
+        """Creates a new container under the specified account as described by request body. The container
+        resource includes metadata and properties for that container. It does not include a list of the
+        blobs contained by the container.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param container_name: The name of the blob container within the specified storage account.
+         Blob container names must be between 3 and 63 characters in length and use numbers, lower-case
+         letters and dash (-) only. Every dash (-) character must be immediately preceded and followed
+         by a letter or number. Required.
+        :type container_name: str
+        :param blob_container: Properties of the blob container to create. Is either a BlobContainer
+         type or a IO[bytes] type. Required.
+        :type blob_container: ~azure.mgmt.storage.v2024_01_01.models.BlobContainer or IO[bytes]
+        :return: BlobContainer or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.BlobContainer
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _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", self._api_version or "2024-01-01"))
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+        cls: ClsType[_models.BlobContainer] = kwargs.pop("cls", None)
+
+        content_type = content_type or "application/json"
+        _json = None
+        _content = None
+        if isinstance(blob_container, (IOBase, bytes)):
+            _content = blob_container
+        else:
+            _json = self._serialize.body(blob_container, "BlobContainer")
+
+        _request = build_create_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            container_name=container_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            content_type=content_type,
+            json=_json,
+            content=_content,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200, 201]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @overload
+    async def update(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        container_name: str,
+        blob_container: _models.BlobContainer,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.BlobContainer:
+        """Updates container properties as specified in request body. Properties not mentioned in the
+        request will be unchanged. Update fails if the specified container doesn't already exist.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param container_name: The name of the blob container within the specified storage account.
+         Blob container names must be between 3 and 63 characters in length and use numbers, lower-case
+         letters and dash (-) only. Every dash (-) character must be immediately preceded and followed
+         by a letter or number. Required.
+        :type container_name: str
+        :param blob_container: Properties to update for the blob container. Required.
+        :type blob_container: ~azure.mgmt.storage.v2024_01_01.models.BlobContainer
+        :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: BlobContainer or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.BlobContainer
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @overload
+    async def update(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        container_name: str,
+        blob_container: IO[bytes],
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.BlobContainer:
+        """Updates container properties as specified in request body. Properties not mentioned in the
+        request will be unchanged. Update fails if the specified container doesn't already exist.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param container_name: The name of the blob container within the specified storage account.
+         Blob container names must be between 3 and 63 characters in length and use numbers, lower-case
+         letters and dash (-) only. Every dash (-) character must be immediately preceded and followed
+         by a letter or number. Required.
+        :type container_name: str
+        :param blob_container: Properties to update for the blob container. Required.
+        :type blob_container: IO[bytes]
+        :keyword content_type: Body Parameter content-type. Content type parameter for binary body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: BlobContainer or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.BlobContainer
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @distributed_trace_async
+    async def update(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        container_name: str,
+        blob_container: Union[_models.BlobContainer, IO[bytes]],
+        **kwargs: Any
+    ) -> _models.BlobContainer:
+        """Updates container properties as specified in request body. Properties not mentioned in the
+        request will be unchanged. Update fails if the specified container doesn't already exist.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param container_name: The name of the blob container within the specified storage account.
+         Blob container names must be between 3 and 63 characters in length and use numbers, lower-case
+         letters and dash (-) only. Every dash (-) character must be immediately preceded and followed
+         by a letter or number. Required.
+        :type container_name: str
+        :param blob_container: Properties to update for the blob container. Is either a BlobContainer
+         type or a IO[bytes] type. Required.
+        :type blob_container: ~azure.mgmt.storage.v2024_01_01.models.BlobContainer or IO[bytes]
+        :return: BlobContainer or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.BlobContainer
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _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", self._api_version or "2024-01-01"))
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+        cls: ClsType[_models.BlobContainer] = kwargs.pop("cls", None)
+
+        content_type = content_type or "application/json"
+        _json = None
+        _content = None
+        if isinstance(blob_container, (IOBase, bytes)):
+            _content = blob_container
+        else:
+            _json = self._serialize.body(blob_container, "BlobContainer")
+
+        _request = build_update_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            container_name=container_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            content_type=content_type,
+            json=_json,
+            content=_content,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @distributed_trace_async
+    async def get(
+        self, resource_group_name: str, account_name: str, container_name: str, **kwargs: Any
+    ) -> _models.BlobContainer:
+        """Gets properties of a specified container.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param container_name: The name of the blob container within the specified storage account.
+         Blob container names must be between 3 and 63 characters in length and use numbers, lower-case
+         letters and dash (-) only. Every dash (-) character must be immediately preceded and followed
+         by a letter or number. Required.
+        :type container_name: str
+        :return: BlobContainer or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.BlobContainer
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.BlobContainer] = kwargs.pop("cls", None)
+
+        _request = build_get_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            container_name=container_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @distributed_trace_async
+    async def delete(self, resource_group_name: str, account_name: str, container_name: str, **kwargs: Any) -> None:
+        """Deletes specified container under its account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param container_name: The name of the blob container within the specified storage account.
+         Blob container names must be between 3 and 63 characters in length and use numbers, lower-case
+         letters and dash (-) only. Every dash (-) character must be immediately preceded and followed
+         by a letter or number. Required.
+        :type container_name: str
+        :return: None or the result of cls(response)
+        :rtype: None
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[None] = kwargs.pop("cls", None)
+
+        _request = build_delete_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            container_name=container_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200, 204]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        if cls:
+            return cls(pipeline_response, None, {})  # type: ignore
+
+    @overload
+    async def set_legal_hold(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        container_name: str,
+        legal_hold: _models.LegalHold,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.LegalHold:
+        """Sets legal hold tags. Setting the same tag results in an idempotent operation. SetLegalHold
+        follows an append pattern and does not clear out the existing tags that are not specified in
+        the request.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param container_name: The name of the blob container within the specified storage account.
+         Blob container names must be between 3 and 63 characters in length and use numbers, lower-case
+         letters and dash (-) only. Every dash (-) character must be immediately preceded and followed
+         by a letter or number. Required.
+        :type container_name: str
+        :param legal_hold: The LegalHold property that will be set to a blob container. Required.
+        :type legal_hold: ~azure.mgmt.storage.v2024_01_01.models.LegalHold
+        :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: LegalHold or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.LegalHold
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @overload
+    async def set_legal_hold(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        container_name: str,
+        legal_hold: IO[bytes],
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.LegalHold:
+        """Sets legal hold tags. Setting the same tag results in an idempotent operation. SetLegalHold
+        follows an append pattern and does not clear out the existing tags that are not specified in
+        the request.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param container_name: The name of the blob container within the specified storage account.
+         Blob container names must be between 3 and 63 characters in length and use numbers, lower-case
+         letters and dash (-) only. Every dash (-) character must be immediately preceded and followed
+         by a letter or number. Required.
+        :type container_name: str
+        :param legal_hold: The LegalHold property that will be set to a blob container. Required.
+        :type legal_hold: IO[bytes]
+        :keyword content_type: Body Parameter content-type. Content type parameter for binary body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: LegalHold or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.LegalHold
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @distributed_trace_async
+    async def set_legal_hold(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        container_name: str,
+        legal_hold: Union[_models.LegalHold, IO[bytes]],
+        **kwargs: Any
+    ) -> _models.LegalHold:
+        """Sets legal hold tags. Setting the same tag results in an idempotent operation. SetLegalHold
+        follows an append pattern and does not clear out the existing tags that are not specified in
+        the request.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param container_name: The name of the blob container within the specified storage account.
+         Blob container names must be between 3 and 63 characters in length and use numbers, lower-case
+         letters and dash (-) only. Every dash (-) character must be immediately preceded and followed
+         by a letter or number. Required.
+        :type container_name: str
+        :param legal_hold: The LegalHold property that will be set to a blob container. Is either a
+         LegalHold type or a IO[bytes] type. Required.
+        :type legal_hold: ~azure.mgmt.storage.v2024_01_01.models.LegalHold or IO[bytes]
+        :return: LegalHold or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.LegalHold
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _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", self._api_version or "2024-01-01"))
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+        cls: ClsType[_models.LegalHold] = kwargs.pop("cls", None)
+
+        content_type = content_type or "application/json"
+        _json = None
+        _content = None
+        if isinstance(legal_hold, (IOBase, bytes)):
+            _content = legal_hold
+        else:
+            _json = self._serialize.body(legal_hold, "LegalHold")
+
+        _request = build_set_legal_hold_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            container_name=container_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            content_type=content_type,
+            json=_json,
+            content=_content,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("LegalHold", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @overload
+    async def clear_legal_hold(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        container_name: str,
+        legal_hold: _models.LegalHold,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.LegalHold:
+        """Clears legal hold tags. Clearing the same or non-existent tag results in an idempotent
+        operation. ClearLegalHold clears out only the specified tags in the request.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param container_name: The name of the blob container within the specified storage account.
+         Blob container names must be between 3 and 63 characters in length and use numbers, lower-case
+         letters and dash (-) only. Every dash (-) character must be immediately preceded and followed
+         by a letter or number. Required.
+        :type container_name: str
+        :param legal_hold: The LegalHold property that will be clear from a blob container. Required.
+        :type legal_hold: ~azure.mgmt.storage.v2024_01_01.models.LegalHold
+        :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: LegalHold or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.LegalHold
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @overload
+    async def clear_legal_hold(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        container_name: str,
+        legal_hold: IO[bytes],
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.LegalHold:
+        """Clears legal hold tags. Clearing the same or non-existent tag results in an idempotent
+        operation. ClearLegalHold clears out only the specified tags in the request.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param container_name: The name of the blob container within the specified storage account.
+         Blob container names must be between 3 and 63 characters in length and use numbers, lower-case
+         letters and dash (-) only. Every dash (-) character must be immediately preceded and followed
+         by a letter or number. Required.
+        :type container_name: str
+        :param legal_hold: The LegalHold property that will be clear from a blob container. Required.
+        :type legal_hold: IO[bytes]
+        :keyword content_type: Body Parameter content-type. Content type parameter for binary body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: LegalHold or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.LegalHold
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @distributed_trace_async
+    async def clear_legal_hold(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        container_name: str,
+        legal_hold: Union[_models.LegalHold, IO[bytes]],
+        **kwargs: Any
+    ) -> _models.LegalHold:
+        """Clears legal hold tags. Clearing the same or non-existent tag results in an idempotent
+        operation. ClearLegalHold clears out only the specified tags in the request.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param container_name: The name of the blob container within the specified storage account.
+         Blob container names must be between 3 and 63 characters in length and use numbers, lower-case
+         letters and dash (-) only. Every dash (-) character must be immediately preceded and followed
+         by a letter or number. Required.
+        :type container_name: str
+        :param legal_hold: The LegalHold property that will be clear from a blob container. Is either a
+         LegalHold type or a IO[bytes] type. Required.
+        :type legal_hold: ~azure.mgmt.storage.v2024_01_01.models.LegalHold or IO[bytes]
+        :return: LegalHold or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.LegalHold
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _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", self._api_version or "2024-01-01"))
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+        cls: ClsType[_models.LegalHold] = kwargs.pop("cls", None)
+
+        content_type = content_type or "application/json"
+        _json = None
+        _content = None
+        if isinstance(legal_hold, (IOBase, bytes)):
+            _content = legal_hold
+        else:
+            _json = self._serialize.body(legal_hold, "LegalHold")
+
+        _request = build_clear_legal_hold_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            container_name=container_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            content_type=content_type,
+            json=_json,
+            content=_content,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("LegalHold", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @overload
+    async def create_or_update_immutability_policy(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        container_name: str,
+        if_match: Optional[str] = None,
+        parameters: Optional[_models.ImmutabilityPolicy] = None,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.ImmutabilityPolicy:
+        """Creates or updates an unlocked immutability policy. ETag in If-Match is honored if given but
+        not required for this operation.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param container_name: The name of the blob container within the specified storage account.
+         Blob container names must be between 3 and 63 characters in length and use numbers, lower-case
+         letters and dash (-) only. Every dash (-) character must be immediately preceded and followed
+         by a letter or number. Required.
+        :type container_name: str
+        :param if_match: The entity state (ETag) version of the immutability policy to update must be
+         returned to the server for all update operations. The ETag value must include the leading and
+         trailing double quotes as returned by the service. Default value is None.
+        :type if_match: str
+        :param parameters: The ImmutabilityPolicy Properties that will be created or updated to a blob
+         container. Default value is None.
+        :type parameters: ~azure.mgmt.storage.v2024_01_01.models.ImmutabilityPolicy
+        :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: ImmutabilityPolicy or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.ImmutabilityPolicy
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @overload
+    async def create_or_update_immutability_policy(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        container_name: str,
+        if_match: Optional[str] = None,
+        parameters: Optional[IO[bytes]] = None,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.ImmutabilityPolicy:
+        """Creates or updates an unlocked immutability policy. ETag in If-Match is honored if given but
+        not required for this operation.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param container_name: The name of the blob container within the specified storage account.
+         Blob container names must be between 3 and 63 characters in length and use numbers, lower-case
+         letters and dash (-) only. Every dash (-) character must be immediately preceded and followed
+         by a letter or number. Required.
+        :type container_name: str
+        :param if_match: The entity state (ETag) version of the immutability policy to update must be
+         returned to the server for all update operations. The ETag value must include the leading and
+         trailing double quotes as returned by the service. Default value is None.
+        :type if_match: str
+        :param parameters: The ImmutabilityPolicy Properties that will be created or updated to a blob
+         container. Default value is None.
+        :type parameters: IO[bytes]
+        :keyword content_type: Body Parameter content-type. Content type parameter for binary body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: ImmutabilityPolicy or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.ImmutabilityPolicy
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @distributed_trace_async
+    async def create_or_update_immutability_policy(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        container_name: str,
+        if_match: Optional[str] = None,
+        parameters: Optional[Union[_models.ImmutabilityPolicy, IO[bytes]]] = None,
+        **kwargs: Any
+    ) -> _models.ImmutabilityPolicy:
+        """Creates or updates an unlocked immutability policy. ETag in If-Match is honored if given but
+        not required for this operation.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param container_name: The name of the blob container within the specified storage account.
+         Blob container names must be between 3 and 63 characters in length and use numbers, lower-case
+         letters and dash (-) only. Every dash (-) character must be immediately preceded and followed
+         by a letter or number. Required.
+        :type container_name: str
+        :param if_match: The entity state (ETag) version of the immutability policy to update must be
+         returned to the server for all update operations. The ETag value must include the leading and
+         trailing double quotes as returned by the service. Default value is None.
+        :type if_match: str
+        :param parameters: The ImmutabilityPolicy Properties that will be created or updated to a blob
+         container. Is either a ImmutabilityPolicy type or a IO[bytes] type. Default value is None.
+        :type parameters: ~azure.mgmt.storage.v2024_01_01.models.ImmutabilityPolicy or IO[bytes]
+        :return: ImmutabilityPolicy or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.ImmutabilityPolicy
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        immutability_policy_name: Literal["default"] = kwargs.pop("immutability_policy_name", "default")
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+        cls: ClsType[_models.ImmutabilityPolicy] = kwargs.pop("cls", None)
+
+        content_type = content_type or "application/json"
+        _json = None
+        _content = None
+        if isinstance(parameters, (IOBase, bytes)):
+            _content = parameters
+        else:
+            if parameters is not None:
+                _json = self._serialize.body(parameters, "ImmutabilityPolicy")
+            else:
+                _json = None
+
+        _request = build_create_or_update_immutability_policy_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            container_name=container_name,
+            subscription_id=self._config.subscription_id,
+            if_match=if_match,
+            immutability_policy_name=immutability_policy_name,
+            api_version=api_version,
+            content_type=content_type,
+            json=_json,
+            content=_content,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        response_headers = {}
+        response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
+
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, response_headers)  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @distributed_trace_async
+    async def get_immutability_policy(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        container_name: str,
+        if_match: Optional[str] = None,
+        **kwargs: Any
+    ) -> _models.ImmutabilityPolicy:
+        """Gets the existing immutability policy along with the corresponding ETag in response headers and
+        body.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param container_name: The name of the blob container within the specified storage account.
+         Blob container names must be between 3 and 63 characters in length and use numbers, lower-case
+         letters and dash (-) only. Every dash (-) character must be immediately preceded and followed
+         by a letter or number. Required.
+        :type container_name: str
+        :param if_match: The entity state (ETag) version of the immutability policy to update must be
+         returned to the server for all update operations. The ETag value must include the leading and
+         trailing double quotes as returned by the service. Default value is None.
+        :type if_match: str
+        :return: ImmutabilityPolicy or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.ImmutabilityPolicy
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        immutability_policy_name: Literal["default"] = kwargs.pop("immutability_policy_name", "default")
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.ImmutabilityPolicy] = kwargs.pop("cls", None)
+
+        _request = build_get_immutability_policy_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            container_name=container_name,
+            subscription_id=self._config.subscription_id,
+            if_match=if_match,
+            immutability_policy_name=immutability_policy_name,
+            api_version=api_version,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        response_headers = {}
+        response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
+
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, response_headers)  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @distributed_trace_async
+    async def delete_immutability_policy(
+        self, resource_group_name: str, account_name: str, container_name: str, if_match: str, **kwargs: Any
+    ) -> _models.ImmutabilityPolicy:
+        """Aborts an unlocked immutability policy. The response of delete has
+        immutabilityPeriodSinceCreationInDays set to 0. ETag in If-Match is required for this
+        operation. Deleting a locked immutability policy is not allowed, the only way is to delete the
+        container after deleting all expired blobs inside the policy locked container.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param container_name: The name of the blob container within the specified storage account.
+         Blob container names must be between 3 and 63 characters in length and use numbers, lower-case
+         letters and dash (-) only. Every dash (-) character must be immediately preceded and followed
+         by a letter or number. Required.
+        :type container_name: str
+        :param if_match: The entity state (ETag) version of the immutability policy to update must be
+         returned to the server for all update operations. The ETag value must include the leading and
+         trailing double quotes as returned by the service. Required.
+        :type if_match: str
+        :return: ImmutabilityPolicy or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.ImmutabilityPolicy
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        immutability_policy_name: Literal["default"] = kwargs.pop("immutability_policy_name", "default")
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.ImmutabilityPolicy] = kwargs.pop("cls", None)
+
+        _request = build_delete_immutability_policy_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            container_name=container_name,
+            subscription_id=self._config.subscription_id,
+            if_match=if_match,
+            immutability_policy_name=immutability_policy_name,
+            api_version=api_version,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        response_headers = {}
+        response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
+
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, response_headers)  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @distributed_trace_async
+    async def lock_immutability_policy(
+        self, resource_group_name: str, account_name: str, container_name: str, if_match: str, **kwargs: Any
+    ) -> _models.ImmutabilityPolicy:
+        """Sets the ImmutabilityPolicy to Locked state. The only action allowed on a Locked policy is
+        ExtendImmutabilityPolicy action. ETag in If-Match is required for this operation.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param container_name: The name of the blob container within the specified storage account.
+         Blob container names must be between 3 and 63 characters in length and use numbers, lower-case
+         letters and dash (-) only. Every dash (-) character must be immediately preceded and followed
+         by a letter or number. Required.
+        :type container_name: str
+        :param if_match: The entity state (ETag) version of the immutability policy to update must be
+         returned to the server for all update operations. The ETag value must include the leading and
+         trailing double quotes as returned by the service. Required.
+        :type if_match: str
+        :return: ImmutabilityPolicy or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.ImmutabilityPolicy
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.ImmutabilityPolicy] = kwargs.pop("cls", None)
+
+        _request = build_lock_immutability_policy_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            container_name=container_name,
+            subscription_id=self._config.subscription_id,
+            if_match=if_match,
+            api_version=api_version,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        response_headers = {}
+        response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
+
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, response_headers)  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @overload
+    async def extend_immutability_policy(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        container_name: str,
+        if_match: str,
+        parameters: Optional[_models.ImmutabilityPolicy] = None,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.ImmutabilityPolicy:
+        """Extends the immutabilityPeriodSinceCreationInDays of a locked immutabilityPolicy. The only
+        action allowed on a Locked policy will be this action. ETag in If-Match is required for this
+        operation.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param container_name: The name of the blob container within the specified storage account.
+         Blob container names must be between 3 and 63 characters in length and use numbers, lower-case
+         letters and dash (-) only. Every dash (-) character must be immediately preceded and followed
+         by a letter or number. Required.
+        :type container_name: str
+        :param if_match: The entity state (ETag) version of the immutability policy to update must be
+         returned to the server for all update operations. The ETag value must include the leading and
+         trailing double quotes as returned by the service. Required.
+        :type if_match: str
+        :param parameters: The ImmutabilityPolicy Properties that will be extended for a blob
+         container. Default value is None.
+        :type parameters: ~azure.mgmt.storage.v2024_01_01.models.ImmutabilityPolicy
+        :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: ImmutabilityPolicy or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.ImmutabilityPolicy
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @overload
+    async def extend_immutability_policy(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        container_name: str,
+        if_match: str,
+        parameters: Optional[IO[bytes]] = None,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.ImmutabilityPolicy:
+        """Extends the immutabilityPeriodSinceCreationInDays of a locked immutabilityPolicy. The only
+        action allowed on a Locked policy will be this action. ETag in If-Match is required for this
+        operation.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param container_name: The name of the blob container within the specified storage account.
+         Blob container names must be between 3 and 63 characters in length and use numbers, lower-case
+         letters and dash (-) only. Every dash (-) character must be immediately preceded and followed
+         by a letter or number. Required.
+        :type container_name: str
+        :param if_match: The entity state (ETag) version of the immutability policy to update must be
+         returned to the server for all update operations. The ETag value must include the leading and
+         trailing double quotes as returned by the service. Required.
+        :type if_match: str
+        :param parameters: The ImmutabilityPolicy Properties that will be extended for a blob
+         container. Default value is None.
+        :type parameters: IO[bytes]
+        :keyword content_type: Body Parameter content-type. Content type parameter for binary body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: ImmutabilityPolicy or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.ImmutabilityPolicy
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @distributed_trace_async
+    async def extend_immutability_policy(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        container_name: str,
+        if_match: str,
+        parameters: Optional[Union[_models.ImmutabilityPolicy, IO[bytes]]] = None,
+        **kwargs: Any
+    ) -> _models.ImmutabilityPolicy:
+        """Extends the immutabilityPeriodSinceCreationInDays of a locked immutabilityPolicy. The only
+        action allowed on a Locked policy will be this action. ETag in If-Match is required for this
+        operation.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param container_name: The name of the blob container within the specified storage account.
+         Blob container names must be between 3 and 63 characters in length and use numbers, lower-case
+         letters and dash (-) only. Every dash (-) character must be immediately preceded and followed
+         by a letter or number. Required.
+        :type container_name: str
+        :param if_match: The entity state (ETag) version of the immutability policy to update must be
+         returned to the server for all update operations. The ETag value must include the leading and
+         trailing double quotes as returned by the service. Required.
+        :type if_match: str
+        :param parameters: The ImmutabilityPolicy Properties that will be extended for a blob
+         container. Is either a ImmutabilityPolicy type or a IO[bytes] type. Default value is None.
+        :type parameters: ~azure.mgmt.storage.v2024_01_01.models.ImmutabilityPolicy or IO[bytes]
+        :return: ImmutabilityPolicy or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.ImmutabilityPolicy
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _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", self._api_version or "2024-01-01"))
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+        cls: ClsType[_models.ImmutabilityPolicy] = kwargs.pop("cls", None)
+
+        content_type = content_type or "application/json"
+        _json = None
+        _content = None
+        if isinstance(parameters, (IOBase, bytes)):
+            _content = parameters
+        else:
+            if parameters is not None:
+                _json = self._serialize.body(parameters, "ImmutabilityPolicy")
+            else:
+                _json = None
+
+        _request = build_extend_immutability_policy_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            container_name=container_name,
+            subscription_id=self._config.subscription_id,
+            if_match=if_match,
+            api_version=api_version,
+            content_type=content_type,
+            json=_json,
+            content=_content,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        response_headers = {}
+        response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
+
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, response_headers)  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @overload
+    async def lease(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        container_name: str,
+        parameters: Optional[_models.LeaseContainerRequest] = None,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.LeaseContainerResponse:
+        """The Lease Container operation establishes and manages a lock on a container for delete
+        operations. The lock duration can be 15 to 60 seconds, or can be infinite.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param container_name: The name of the blob container within the specified storage account.
+         Blob container names must be between 3 and 63 characters in length and use numbers, lower-case
+         letters and dash (-) only. Every dash (-) character must be immediately preceded and followed
+         by a letter or number. Required.
+        :type container_name: str
+        :param parameters: Lease Container request body. Default value is None.
+        :type parameters: ~azure.mgmt.storage.v2024_01_01.models.LeaseContainerRequest
+        :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: LeaseContainerResponse or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.LeaseContainerResponse
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @overload
+    async def lease(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        container_name: str,
+        parameters: Optional[IO[bytes]] = None,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.LeaseContainerResponse:
+        """The Lease Container operation establishes and manages a lock on a container for delete
+        operations. The lock duration can be 15 to 60 seconds, or can be infinite.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param container_name: The name of the blob container within the specified storage account.
+         Blob container names must be between 3 and 63 characters in length and use numbers, lower-case
+         letters and dash (-) only. Every dash (-) character must be immediately preceded and followed
+         by a letter or number. Required.
+        :type container_name: str
+        :param parameters: Lease Container request body. Default value is None.
+        :type parameters: IO[bytes]
+        :keyword content_type: Body Parameter content-type. Content type parameter for binary body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: LeaseContainerResponse or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.LeaseContainerResponse
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @distributed_trace_async
+    async def lease(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        container_name: str,
+        parameters: Optional[Union[_models.LeaseContainerRequest, IO[bytes]]] = None,
+        **kwargs: Any
+    ) -> _models.LeaseContainerResponse:
+        """The Lease Container operation establishes and manages a lock on a container for delete
+        operations. The lock duration can be 15 to 60 seconds, or can be infinite.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param container_name: The name of the blob container within the specified storage account.
+         Blob container names must be between 3 and 63 characters in length and use numbers, lower-case
+         letters and dash (-) only. Every dash (-) character must be immediately preceded and followed
+         by a letter or number. Required.
+        :type container_name: str
+        :param parameters: Lease Container request body. Is either a LeaseContainerRequest type or a
+         IO[bytes] type. Default value is None.
+        :type parameters: ~azure.mgmt.storage.v2024_01_01.models.LeaseContainerRequest or IO[bytes]
+        :return: LeaseContainerResponse or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.LeaseContainerResponse
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _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", self._api_version or "2024-01-01"))
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+        cls: ClsType[_models.LeaseContainerResponse] = kwargs.pop("cls", None)
+
+        content_type = content_type or "application/json"
+        _json = None
+        _content = None
+        if isinstance(parameters, (IOBase, bytes)):
+            _content = parameters
+        else:
+            if parameters is not None:
+                _json = self._serialize.body(parameters, "LeaseContainerRequest")
+            else:
+                _json = None
+
+        _request = build_lease_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            container_name=container_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            content_type=content_type,
+            json=_json,
+            content=_content,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("LeaseContainerResponse", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    async def _object_level_worm_initial(
+        self, resource_group_name: str, account_name: str, container_name: str, **kwargs: Any
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
+
+        _request = build_object_level_worm_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            container_name=container_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
+        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200, 202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @distributed_trace_async
+    async def begin_object_level_worm(
+        self, resource_group_name: str, account_name: str, container_name: str, **kwargs: Any
+    ) -> AsyncLROPoller[None]:
+        """This operation migrates a blob container from container level WORM to object level immutability
+        enabled container. Prerequisites require a container level immutability policy either in locked
+        or unlocked state, Account level versioning must be enabled and there should be no Legal hold
+        on the container.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param container_name: The name of the blob container within the specified storage account.
+         Blob container names must be between 3 and 63 characters in length and use numbers, lower-case
+         letters and dash (-) only. Every dash (-) character must be immediately preceded and followed
+         by a letter or number. Required.
+        :type container_name: str
+        :return: An instance of AsyncLROPoller that returns either None or the result of cls(response)
+        :rtype: ~azure.core.polling.AsyncLROPoller[None]
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[None] = kwargs.pop("cls", None)
+        polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True)
+        lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
+        cont_token: Optional[str] = kwargs.pop("continuation_token", None)
+        if cont_token is None:
+            raw_result = await self._object_level_worm_initial(
+                resource_group_name=resource_group_name,
+                account_name=account_name,
+                container_name=container_name,
+                api_version=api_version,
+                cls=lambda x, y, z: x,
+                headers=_headers,
+                params=_params,
+                **kwargs
+            )
+            await raw_result.http_response.read()  # type: ignore
+        kwargs.pop("error_map", None)
+
+        def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
+            if cls:
+                return cls(pipeline_response, None, {})  # type: ignore
+
+        if polling is True:
+            polling_method: AsyncPollingMethod = cast(
+                AsyncPollingMethod, AsyncARMPolling(lro_delay, lro_options={"final-state-via": "location"}, **kwargs)
+            )
+        elif polling is False:
+            polling_method = cast(AsyncPollingMethod, AsyncNoPolling())
+        else:
+            polling_method = polling
+        if cont_token:
+            return AsyncLROPoller[None].from_continuation_token(
+                polling_method=polling_method,
+                continuation_token=cont_token,
+                client=self._client,
+                deserialization_callback=get_long_running_output,
+            )
+        return AsyncLROPoller[None](self._client, raw_result, get_long_running_output, polling_method)  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/operations/_blob_inventory_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/operations/_blob_inventory_policies_operations.py
new file mode 100644
index 000000000000..56543d68deb1
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/operations/_blob_inventory_policies_operations.py
@@ -0,0 +1,434 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+from io import IOBase
+import sys
+from typing import Any, AsyncIterable, Callable, Dict, IO, Optional, TypeVar, Union, overload
+import urllib.parse
+
+from azure.core.async_paging import AsyncItemPaged, AsyncList
+from azure.core.exceptions import (
+    ClientAuthenticationError,
+    HttpResponseError,
+    ResourceExistsError,
+    ResourceNotFoundError,
+    ResourceNotModifiedError,
+    map_error,
+)
+from azure.core.pipeline import PipelineResponse
+from azure.core.rest import AsyncHttpResponse, HttpRequest
+from azure.core.tracing.decorator import distributed_trace
+from azure.core.tracing.decorator_async import distributed_trace_async
+from azure.core.utils import case_insensitive_dict
+from azure.mgmt.core.exceptions import ARMErrorFormat
+
+from ... import models as _models
+from ...operations._blob_inventory_policies_operations import (
+    build_create_or_update_request,
+    build_delete_request,
+    build_get_request,
+    build_list_request,
+)
+
+if sys.version_info >= (3, 9):
+    from collections.abc import MutableMapping
+else:
+    from typing import MutableMapping  # type: ignore
+T = TypeVar("T")
+ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
+
+
+class BlobInventoryPoliciesOperations:
+    """
+    .. warning::
+        **DO NOT** instantiate this class directly.
+
+        Instead, you should access the following operations through
+        :class:`~azure.mgmt.storage.v2024_01_01.aio.StorageManagementClient`'s
+        :attr:`blob_inventory_policies` attribute.
+    """
+
+    models = _models
+
+    def __init__(self, *args, **kwargs) -> None:
+        input_args = list(args)
+        self._client = input_args.pop(0) if input_args else kwargs.pop("client")
+        self._config = input_args.pop(0) if input_args else kwargs.pop("config")
+        self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer")
+        self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer")
+        self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version")
+
+    @distributed_trace_async
+    async def get(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        blob_inventory_policy_name: Union[str, _models.BlobInventoryPolicyName],
+        **kwargs: Any
+    ) -> _models.BlobInventoryPolicy:
+        """Gets the blob inventory policy associated with the specified storage account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param blob_inventory_policy_name: The name of the storage account blob inventory policy. It
+         should always be 'default'. "default" Required.
+        :type blob_inventory_policy_name: str or
+         ~azure.mgmt.storage.v2024_01_01.models.BlobInventoryPolicyName
+        :return: BlobInventoryPolicy or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.BlobInventoryPolicy
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.BlobInventoryPolicy] = kwargs.pop("cls", None)
+
+        _request = build_get_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            blob_inventory_policy_name=blob_inventory_policy_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @overload
+    async def create_or_update(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        blob_inventory_policy_name: Union[str, _models.BlobInventoryPolicyName],
+        properties: _models.BlobInventoryPolicy,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.BlobInventoryPolicy:
+        """Sets the blob inventory policy to the specified storage account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param blob_inventory_policy_name: The name of the storage account blob inventory policy. It
+         should always be 'default'. "default" Required.
+        :type blob_inventory_policy_name: str or
+         ~azure.mgmt.storage.v2024_01_01.models.BlobInventoryPolicyName
+        :param properties: The blob inventory policy set to a storage account. Required.
+        :type properties: ~azure.mgmt.storage.v2024_01_01.models.BlobInventoryPolicy
+        :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: BlobInventoryPolicy or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.BlobInventoryPolicy
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @overload
+    async def create_or_update(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        blob_inventory_policy_name: Union[str, _models.BlobInventoryPolicyName],
+        properties: IO[bytes],
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.BlobInventoryPolicy:
+        """Sets the blob inventory policy to the specified storage account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param blob_inventory_policy_name: The name of the storage account blob inventory policy. It
+         should always be 'default'. "default" Required.
+        :type blob_inventory_policy_name: str or
+         ~azure.mgmt.storage.v2024_01_01.models.BlobInventoryPolicyName
+        :param properties: The blob inventory policy set to a storage account. Required.
+        :type properties: IO[bytes]
+        :keyword content_type: Body Parameter content-type. Content type parameter for binary body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: BlobInventoryPolicy or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.BlobInventoryPolicy
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @distributed_trace_async
+    async def create_or_update(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        blob_inventory_policy_name: Union[str, _models.BlobInventoryPolicyName],
+        properties: Union[_models.BlobInventoryPolicy, IO[bytes]],
+        **kwargs: Any
+    ) -> _models.BlobInventoryPolicy:
+        """Sets the blob inventory policy to the specified storage account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param blob_inventory_policy_name: The name of the storage account blob inventory policy. It
+         should always be 'default'. "default" Required.
+        :type blob_inventory_policy_name: str or
+         ~azure.mgmt.storage.v2024_01_01.models.BlobInventoryPolicyName
+        :param properties: The blob inventory policy set to a storage account. Is either a
+         BlobInventoryPolicy type or a IO[bytes] type. Required.
+        :type properties: ~azure.mgmt.storage.v2024_01_01.models.BlobInventoryPolicy or IO[bytes]
+        :return: BlobInventoryPolicy or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.BlobInventoryPolicy
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _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", self._api_version or "2024-01-01"))
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+        cls: ClsType[_models.BlobInventoryPolicy] = kwargs.pop("cls", None)
+
+        content_type = content_type or "application/json"
+        _json = None
+        _content = None
+        if isinstance(properties, (IOBase, bytes)):
+            _content = properties
+        else:
+            _json = self._serialize.body(properties, "BlobInventoryPolicy")
+
+        _request = build_create_or_update_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            blob_inventory_policy_name=blob_inventory_policy_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            content_type=content_type,
+            json=_json,
+            content=_content,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @distributed_trace_async
+    async def delete(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        blob_inventory_policy_name: Union[str, _models.BlobInventoryPolicyName],
+        **kwargs: Any
+    ) -> None:
+        """Deletes the blob inventory policy associated with the specified storage account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param blob_inventory_policy_name: The name of the storage account blob inventory policy. It
+         should always be 'default'. "default" Required.
+        :type blob_inventory_policy_name: str or
+         ~azure.mgmt.storage.v2024_01_01.models.BlobInventoryPolicyName
+        :return: None or the result of cls(response)
+        :rtype: None
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[None] = kwargs.pop("cls", None)
+
+        _request = build_delete_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            blob_inventory_policy_name=blob_inventory_policy_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200, 204]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        if cls:
+            return cls(pipeline_response, None, {})  # type: ignore
+
+    @distributed_trace
+    def list(
+        self, resource_group_name: str, account_name: str, **kwargs: Any
+    ) -> AsyncIterable["_models.BlobInventoryPolicy"]:
+        """Gets the blob inventory policy associated with the specified storage account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :return: An iterator like instance of either BlobInventoryPolicy or the result of cls(response)
+        :rtype:
+         ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.storage.v2024_01_01.models.BlobInventoryPolicy]
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.ListBlobInventoryPolicy] = kwargs.pop("cls", None)
+
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        def prepare_request(next_link=None):
+            if not next_link:
+
+                _request = build_list_request(
+                    resource_group_name=resource_group_name,
+                    account_name=account_name,
+                    subscription_id=self._config.subscription_id,
+                    api_version=api_version,
+                    headers=_headers,
+                    params=_params,
+                )
+                _request.url = self._client.format_url(_request.url)
+
+            else:
+                # make call to next link with the client's api-version
+                _parsed_next_link = urllib.parse.urlparse(next_link)
+                _next_request_params = case_insensitive_dict(
+                    {
+                        key: [urllib.parse.quote(v) for v in value]
+                        for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items()
+                    }
+                )
+                _next_request_params["api-version"] = self._api_version
+                _request = HttpRequest(
+                    "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
+                )
+                _request.url = self._client.format_url(_request.url)
+                _request.method = "GET"
+            return _request
+
+        async def extract_data(pipeline_response):
+            deserialized = self._deserialize("ListBlobInventoryPolicy", pipeline_response)
+            list_of_elem = deserialized.value
+            if cls:
+                list_of_elem = cls(list_of_elem)  # type: ignore
+            return None, AsyncList(list_of_elem)
+
+        async def get_next(next_link=None):
+            _request = prepare_request(next_link)
+
+            _stream = False
+            pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+                _request, stream=_stream, **kwargs
+            )
+            response = pipeline_response.http_response
+
+            if response.status_code not in [200]:
+                map_error(status_code=response.status_code, response=response, error_map=error_map)
+                error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
+                raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
+
+            return pipeline_response
+
+        return AsyncItemPaged(get_next, extract_data)
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/operations/_blob_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/operations/_blob_services_operations.py
new file mode 100644
index 000000000000..d5d9b9a6c7a7
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/operations/_blob_services_operations.py
@@ -0,0 +1,355 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+from io import IOBase
+import sys
+from typing import Any, AsyncIterable, Callable, Dict, IO, Literal, Optional, TypeVar, Union, overload
+import urllib.parse
+
+from azure.core.async_paging import AsyncItemPaged, AsyncList
+from azure.core.exceptions import (
+    ClientAuthenticationError,
+    HttpResponseError,
+    ResourceExistsError,
+    ResourceNotFoundError,
+    ResourceNotModifiedError,
+    map_error,
+)
+from azure.core.pipeline import PipelineResponse
+from azure.core.rest import AsyncHttpResponse, HttpRequest
+from azure.core.tracing.decorator import distributed_trace
+from azure.core.tracing.decorator_async import distributed_trace_async
+from azure.core.utils import case_insensitive_dict
+from azure.mgmt.core.exceptions import ARMErrorFormat
+
+from ... import models as _models
+from ...operations._blob_services_operations import (
+    build_get_service_properties_request,
+    build_list_request,
+    build_set_service_properties_request,
+)
+
+if sys.version_info >= (3, 9):
+    from collections.abc import MutableMapping
+else:
+    from typing import MutableMapping  # type: ignore
+T = TypeVar("T")
+ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
+
+
+class BlobServicesOperations:
+    """
+    .. warning::
+        **DO NOT** instantiate this class directly.
+
+        Instead, you should access the following operations through
+        :class:`~azure.mgmt.storage.v2024_01_01.aio.StorageManagementClient`'s
+        :attr:`blob_services` attribute.
+    """
+
+    models = _models
+
+    def __init__(self, *args, **kwargs) -> None:
+        input_args = list(args)
+        self._client = input_args.pop(0) if input_args else kwargs.pop("client")
+        self._config = input_args.pop(0) if input_args else kwargs.pop("config")
+        self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer")
+        self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer")
+        self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version")
+
+    @distributed_trace
+    def list(
+        self, resource_group_name: str, account_name: str, **kwargs: Any
+    ) -> AsyncIterable["_models.BlobServiceProperties"]:
+        """List blob services of storage account. It returns a collection of one object named default.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :return: An iterator like instance of either BlobServiceProperties or the result of
+         cls(response)
+        :rtype:
+         ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.storage.v2024_01_01.models.BlobServiceProperties]
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.BlobServiceItems] = kwargs.pop("cls", None)
+
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        def prepare_request(next_link=None):
+            if not next_link:
+
+                _request = build_list_request(
+                    resource_group_name=resource_group_name,
+                    account_name=account_name,
+                    subscription_id=self._config.subscription_id,
+                    api_version=api_version,
+                    headers=_headers,
+                    params=_params,
+                )
+                _request.url = self._client.format_url(_request.url)
+
+            else:
+                # make call to next link with the client's api-version
+                _parsed_next_link = urllib.parse.urlparse(next_link)
+                _next_request_params = case_insensitive_dict(
+                    {
+                        key: [urllib.parse.quote(v) for v in value]
+                        for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items()
+                    }
+                )
+                _next_request_params["api-version"] = self._api_version
+                _request = HttpRequest(
+                    "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
+                )
+                _request.url = self._client.format_url(_request.url)
+                _request.method = "GET"
+            return _request
+
+        async def extract_data(pipeline_response):
+            deserialized = self._deserialize("BlobServiceItems", pipeline_response)
+            list_of_elem = deserialized.value
+            if cls:
+                list_of_elem = cls(list_of_elem)  # type: ignore
+            return None, AsyncList(list_of_elem)
+
+        async def get_next(next_link=None):
+            _request = prepare_request(next_link)
+
+            _stream = False
+            pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+                _request, stream=_stream, **kwargs
+            )
+            response = pipeline_response.http_response
+
+            if response.status_code not in [200]:
+                map_error(status_code=response.status_code, response=response, error_map=error_map)
+                raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+            return pipeline_response
+
+        return AsyncItemPaged(get_next, extract_data)
+
+    @overload
+    async def set_service_properties(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        parameters: _models.BlobServiceProperties,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.BlobServiceProperties:
+        """Sets the properties of a storage account’s Blob service, including properties for Storage
+        Analytics and CORS (Cross-Origin Resource Sharing) rules.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param parameters: The properties of a storage account’s Blob service, including properties for
+         Storage Analytics and CORS (Cross-Origin Resource Sharing) rules. Required.
+        :type parameters: ~azure.mgmt.storage.v2024_01_01.models.BlobServiceProperties
+        :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: BlobServiceProperties or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.BlobServiceProperties
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @overload
+    async def set_service_properties(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        parameters: IO[bytes],
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.BlobServiceProperties:
+        """Sets the properties of a storage account’s Blob service, including properties for Storage
+        Analytics and CORS (Cross-Origin Resource Sharing) rules.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param parameters: The properties of a storage account’s Blob service, including properties for
+         Storage Analytics and CORS (Cross-Origin Resource Sharing) rules. Required.
+        :type parameters: IO[bytes]
+        :keyword content_type: Body Parameter content-type. Content type parameter for binary body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: BlobServiceProperties or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.BlobServiceProperties
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @distributed_trace_async
+    async def set_service_properties(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        parameters: Union[_models.BlobServiceProperties, IO[bytes]],
+        **kwargs: Any
+    ) -> _models.BlobServiceProperties:
+        """Sets the properties of a storage account’s Blob service, including properties for Storage
+        Analytics and CORS (Cross-Origin Resource Sharing) rules.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param parameters: The properties of a storage account’s Blob service, including properties for
+         Storage Analytics and CORS (Cross-Origin Resource Sharing) rules. Is either a
+         BlobServiceProperties type or a IO[bytes] type. Required.
+        :type parameters: ~azure.mgmt.storage.v2024_01_01.models.BlobServiceProperties or IO[bytes]
+        :return: BlobServiceProperties or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.BlobServiceProperties
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _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", self._api_version or "2024-01-01"))
+        blob_services_name: Literal["default"] = kwargs.pop("blob_services_name", "default")
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+        cls: ClsType[_models.BlobServiceProperties] = kwargs.pop("cls", None)
+
+        content_type = content_type or "application/json"
+        _json = None
+        _content = None
+        if isinstance(parameters, (IOBase, bytes)):
+            _content = parameters
+        else:
+            _json = self._serialize.body(parameters, "BlobServiceProperties")
+
+        _request = build_set_service_properties_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            blob_services_name=blob_services_name,
+            content_type=content_type,
+            json=_json,
+            content=_content,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("BlobServiceProperties", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @distributed_trace_async
+    async def get_service_properties(
+        self, resource_group_name: str, account_name: str, **kwargs: Any
+    ) -> _models.BlobServiceProperties:
+        """Gets the properties of a storage account’s Blob service, including properties for Storage
+        Analytics and CORS (Cross-Origin Resource Sharing) rules.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :return: BlobServiceProperties or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.BlobServiceProperties
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        blob_services_name: Literal["default"] = kwargs.pop("blob_services_name", "default")
+        cls: ClsType[_models.BlobServiceProperties] = kwargs.pop("cls", None)
+
+        _request = build_get_service_properties_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            blob_services_name=blob_services_name,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("BlobServiceProperties", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/operations/_deleted_accounts_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/operations/_deleted_accounts_operations.py
new file mode 100644
index 000000000000..6c947379cb5e
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/operations/_deleted_accounts_operations.py
@@ -0,0 +1,188 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+import sys
+from typing import Any, AsyncIterable, Callable, Dict, Optional, TypeVar
+import urllib.parse
+
+from azure.core.async_paging import AsyncItemPaged, AsyncList
+from azure.core.exceptions import (
+    ClientAuthenticationError,
+    HttpResponseError,
+    ResourceExistsError,
+    ResourceNotFoundError,
+    ResourceNotModifiedError,
+    map_error,
+)
+from azure.core.pipeline import PipelineResponse
+from azure.core.rest import AsyncHttpResponse, HttpRequest
+from azure.core.tracing.decorator import distributed_trace
+from azure.core.tracing.decorator_async import distributed_trace_async
+from azure.core.utils import case_insensitive_dict
+from azure.mgmt.core.exceptions import ARMErrorFormat
+
+from ... import models as _models
+from ...operations._deleted_accounts_operations import build_get_request, build_list_request
+
+if sys.version_info >= (3, 9):
+    from collections.abc import MutableMapping
+else:
+    from typing import MutableMapping  # type: ignore
+T = TypeVar("T")
+ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
+
+
+class DeletedAccountsOperations:
+    """
+    .. warning::
+        **DO NOT** instantiate this class directly.
+
+        Instead, you should access the following operations through
+        :class:`~azure.mgmt.storage.v2024_01_01.aio.StorageManagementClient`'s
+        :attr:`deleted_accounts` attribute.
+    """
+
+    models = _models
+
+    def __init__(self, *args, **kwargs) -> None:
+        input_args = list(args)
+        self._client = input_args.pop(0) if input_args else kwargs.pop("client")
+        self._config = input_args.pop(0) if input_args else kwargs.pop("config")
+        self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer")
+        self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer")
+        self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version")
+
+    @distributed_trace
+    def list(self, **kwargs: Any) -> AsyncIterable["_models.DeletedAccount"]:
+        """Lists deleted accounts under the subscription.
+
+        :return: An iterator like instance of either DeletedAccount or the result of cls(response)
+        :rtype:
+         ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.storage.v2024_01_01.models.DeletedAccount]
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.DeletedAccountListResult] = kwargs.pop("cls", None)
+
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        def prepare_request(next_link=None):
+            if not next_link:
+
+                _request = build_list_request(
+                    subscription_id=self._config.subscription_id,
+                    api_version=api_version,
+                    headers=_headers,
+                    params=_params,
+                )
+                _request.url = self._client.format_url(_request.url)
+
+            else:
+                # make call to next link with the client's api-version
+                _parsed_next_link = urllib.parse.urlparse(next_link)
+                _next_request_params = case_insensitive_dict(
+                    {
+                        key: [urllib.parse.quote(v) for v in value]
+                        for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items()
+                    }
+                )
+                _next_request_params["api-version"] = self._api_version
+                _request = HttpRequest(
+                    "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
+                )
+                _request.url = self._client.format_url(_request.url)
+                _request.method = "GET"
+            return _request
+
+        async def extract_data(pipeline_response):
+            deserialized = self._deserialize("DeletedAccountListResult", pipeline_response)
+            list_of_elem = deserialized.value
+            if cls:
+                list_of_elem = cls(list_of_elem)  # type: ignore
+            return deserialized.next_link or None, AsyncList(list_of_elem)
+
+        async def get_next(next_link=None):
+            _request = prepare_request(next_link)
+
+            _stream = False
+            pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+                _request, stream=_stream, **kwargs
+            )
+            response = pipeline_response.http_response
+
+            if response.status_code not in [200]:
+                map_error(status_code=response.status_code, response=response, error_map=error_map)
+                error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
+                raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
+
+            return pipeline_response
+
+        return AsyncItemPaged(get_next, extract_data)
+
+    @distributed_trace_async
+    async def get(self, deleted_account_name: str, location: str, **kwargs: Any) -> _models.DeletedAccount:
+        """Get properties of specified deleted account resource.
+
+        :param deleted_account_name: Name of the deleted storage account. Required.
+        :type deleted_account_name: str
+        :param location: The location of the deleted storage account. Required.
+        :type location: str
+        :return: DeletedAccount or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.DeletedAccount
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.DeletedAccount] = kwargs.pop("cls", None)
+
+        _request = build_get_request(
+            deleted_account_name=deleted_account_name,
+            location=location,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
+            raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("DeletedAccount", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/operations/_encryption_scopes_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/operations/_encryption_scopes_operations.py
new file mode 100644
index 000000000000..448f45a78459
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/operations/_encryption_scopes_operations.py
@@ -0,0 +1,556 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+from io import IOBase
+import sys
+from typing import Any, AsyncIterable, Callable, Dict, IO, Optional, TypeVar, Union, overload
+import urllib.parse
+
+from azure.core.async_paging import AsyncItemPaged, AsyncList
+from azure.core.exceptions import (
+    ClientAuthenticationError,
+    HttpResponseError,
+    ResourceExistsError,
+    ResourceNotFoundError,
+    ResourceNotModifiedError,
+    map_error,
+)
+from azure.core.pipeline import PipelineResponse
+from azure.core.rest import AsyncHttpResponse, HttpRequest
+from azure.core.tracing.decorator import distributed_trace
+from azure.core.tracing.decorator_async import distributed_trace_async
+from azure.core.utils import case_insensitive_dict
+from azure.mgmt.core.exceptions import ARMErrorFormat
+
+from ... import models as _models
+from ...operations._encryption_scopes_operations import (
+    build_get_request,
+    build_list_request,
+    build_patch_request,
+    build_put_request,
+)
+
+if sys.version_info >= (3, 9):
+    from collections.abc import MutableMapping
+else:
+    from typing import MutableMapping  # type: ignore
+T = TypeVar("T")
+ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
+
+
+class EncryptionScopesOperations:
+    """
+    .. warning::
+        **DO NOT** instantiate this class directly.
+
+        Instead, you should access the following operations through
+        :class:`~azure.mgmt.storage.v2024_01_01.aio.StorageManagementClient`'s
+        :attr:`encryption_scopes` attribute.
+    """
+
+    models = _models
+
+    def __init__(self, *args, **kwargs) -> None:
+        input_args = list(args)
+        self._client = input_args.pop(0) if input_args else kwargs.pop("client")
+        self._config = input_args.pop(0) if input_args else kwargs.pop("config")
+        self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer")
+        self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer")
+        self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version")
+
+    @overload
+    async def put(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        encryption_scope_name: str,
+        encryption_scope: _models.EncryptionScope,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.EncryptionScope:
+        """Synchronously creates or updates an encryption scope under the specified storage account. If an
+        encryption scope is already created and a subsequent request is issued with different
+        properties, the encryption scope properties will be updated per the specified request.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param encryption_scope_name: The name of the encryption scope within the specified storage
+         account. Encryption scope names must be between 3 and 63 characters in length and use numbers,
+         lower-case letters and dash (-) only. Every dash (-) character must be immediately preceded and
+         followed by a letter or number. Required.
+        :type encryption_scope_name: str
+        :param encryption_scope: Encryption scope properties to be used for the create or update.
+         Required.
+        :type encryption_scope: ~azure.mgmt.storage.v2024_01_01.models.EncryptionScope
+        :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: EncryptionScope or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.EncryptionScope
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @overload
+    async def put(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        encryption_scope_name: str,
+        encryption_scope: IO[bytes],
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.EncryptionScope:
+        """Synchronously creates or updates an encryption scope under the specified storage account. If an
+        encryption scope is already created and a subsequent request is issued with different
+        properties, the encryption scope properties will be updated per the specified request.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param encryption_scope_name: The name of the encryption scope within the specified storage
+         account. Encryption scope names must be between 3 and 63 characters in length and use numbers,
+         lower-case letters and dash (-) only. Every dash (-) character must be immediately preceded and
+         followed by a letter or number. Required.
+        :type encryption_scope_name: str
+        :param encryption_scope: Encryption scope properties to be used for the create or update.
+         Required.
+        :type encryption_scope: IO[bytes]
+        :keyword content_type: Body Parameter content-type. Content type parameter for binary body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: EncryptionScope or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.EncryptionScope
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @distributed_trace_async
+    async def put(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        encryption_scope_name: str,
+        encryption_scope: Union[_models.EncryptionScope, IO[bytes]],
+        **kwargs: Any
+    ) -> _models.EncryptionScope:
+        """Synchronously creates or updates an encryption scope under the specified storage account. If an
+        encryption scope is already created and a subsequent request is issued with different
+        properties, the encryption scope properties will be updated per the specified request.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param encryption_scope_name: The name of the encryption scope within the specified storage
+         account. Encryption scope names must be between 3 and 63 characters in length and use numbers,
+         lower-case letters and dash (-) only. Every dash (-) character must be immediately preceded and
+         followed by a letter or number. Required.
+        :type encryption_scope_name: str
+        :param encryption_scope: Encryption scope properties to be used for the create or update. Is
+         either a EncryptionScope type or a IO[bytes] type. Required.
+        :type encryption_scope: ~azure.mgmt.storage.v2024_01_01.models.EncryptionScope or IO[bytes]
+        :return: EncryptionScope or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.EncryptionScope
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _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", self._api_version or "2024-01-01"))
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+        cls: ClsType[_models.EncryptionScope] = kwargs.pop("cls", None)
+
+        content_type = content_type or "application/json"
+        _json = None
+        _content = None
+        if isinstance(encryption_scope, (IOBase, bytes)):
+            _content = encryption_scope
+        else:
+            _json = self._serialize.body(encryption_scope, "EncryptionScope")
+
+        _request = build_put_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            encryption_scope_name=encryption_scope_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            content_type=content_type,
+            json=_json,
+            content=_content,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200, 201]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
+            raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("EncryptionScope", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @overload
+    async def patch(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        encryption_scope_name: str,
+        encryption_scope: _models.EncryptionScope,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.EncryptionScope:
+        """Update encryption scope properties as specified in the request body. Update fails if the
+        specified encryption scope does not already exist.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param encryption_scope_name: The name of the encryption scope within the specified storage
+         account. Encryption scope names must be between 3 and 63 characters in length and use numbers,
+         lower-case letters and dash (-) only. Every dash (-) character must be immediately preceded and
+         followed by a letter or number. Required.
+        :type encryption_scope_name: str
+        :param encryption_scope: Encryption scope properties to be used for the update. Required.
+        :type encryption_scope: ~azure.mgmt.storage.v2024_01_01.models.EncryptionScope
+        :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: EncryptionScope or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.EncryptionScope
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @overload
+    async def patch(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        encryption_scope_name: str,
+        encryption_scope: IO[bytes],
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.EncryptionScope:
+        """Update encryption scope properties as specified in the request body. Update fails if the
+        specified encryption scope does not already exist.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param encryption_scope_name: The name of the encryption scope within the specified storage
+         account. Encryption scope names must be between 3 and 63 characters in length and use numbers,
+         lower-case letters and dash (-) only. Every dash (-) character must be immediately preceded and
+         followed by a letter or number. Required.
+        :type encryption_scope_name: str
+        :param encryption_scope: Encryption scope properties to be used for the update. Required.
+        :type encryption_scope: IO[bytes]
+        :keyword content_type: Body Parameter content-type. Content type parameter for binary body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: EncryptionScope or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.EncryptionScope
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @distributed_trace_async
+    async def patch(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        encryption_scope_name: str,
+        encryption_scope: Union[_models.EncryptionScope, IO[bytes]],
+        **kwargs: Any
+    ) -> _models.EncryptionScope:
+        """Update encryption scope properties as specified in the request body. Update fails if the
+        specified encryption scope does not already exist.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param encryption_scope_name: The name of the encryption scope within the specified storage
+         account. Encryption scope names must be between 3 and 63 characters in length and use numbers,
+         lower-case letters and dash (-) only. Every dash (-) character must be immediately preceded and
+         followed by a letter or number. Required.
+        :type encryption_scope_name: str
+        :param encryption_scope: Encryption scope properties to be used for the update. Is either a
+         EncryptionScope type or a IO[bytes] type. Required.
+        :type encryption_scope: ~azure.mgmt.storage.v2024_01_01.models.EncryptionScope or IO[bytes]
+        :return: EncryptionScope or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.EncryptionScope
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _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", self._api_version or "2024-01-01"))
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+        cls: ClsType[_models.EncryptionScope] = kwargs.pop("cls", None)
+
+        content_type = content_type or "application/json"
+        _json = None
+        _content = None
+        if isinstance(encryption_scope, (IOBase, bytes)):
+            _content = encryption_scope
+        else:
+            _json = self._serialize.body(encryption_scope, "EncryptionScope")
+
+        _request = build_patch_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            encryption_scope_name=encryption_scope_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            content_type=content_type,
+            json=_json,
+            content=_content,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
+            raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("EncryptionScope", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @distributed_trace_async
+    async def get(
+        self, resource_group_name: str, account_name: str, encryption_scope_name: str, **kwargs: Any
+    ) -> _models.EncryptionScope:
+        """Returns the properties for the specified encryption scope.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param encryption_scope_name: The name of the encryption scope within the specified storage
+         account. Encryption scope names must be between 3 and 63 characters in length and use numbers,
+         lower-case letters and dash (-) only. Every dash (-) character must be immediately preceded and
+         followed by a letter or number. Required.
+        :type encryption_scope_name: str
+        :return: EncryptionScope or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.EncryptionScope
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.EncryptionScope] = kwargs.pop("cls", None)
+
+        _request = build_get_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            encryption_scope_name=encryption_scope_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
+            raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("EncryptionScope", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @distributed_trace
+    def list(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        maxpagesize: Optional[int] = None,
+        filter: Optional[str] = None,
+        include: Optional[Union[str, _models.ListEncryptionScopesInclude]] = None,
+        **kwargs: Any
+    ) -> AsyncIterable["_models.EncryptionScope"]:
+        """Lists all the encryption scopes available under the specified storage account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param maxpagesize: Optional, specifies the maximum number of encryption scopes that will be
+         included in the list response. Default value is None.
+        :type maxpagesize: int
+        :param filter: Optional. When specified, only encryption scope names starting with the filter
+         will be listed. Default value is None.
+        :type filter: str
+        :param include: Optional, when specified, will list encryption scopes with the specific state.
+         Defaults to All. Known values are: "All", "Enabled", and "Disabled". Default value is None.
+        :type include: str or ~azure.mgmt.storage.v2024_01_01.models.ListEncryptionScopesInclude
+        :return: An iterator like instance of either EncryptionScope or the result of cls(response)
+        :rtype:
+         ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.storage.v2024_01_01.models.EncryptionScope]
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.EncryptionScopeListResult] = kwargs.pop("cls", None)
+
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        def prepare_request(next_link=None):
+            if not next_link:
+
+                _request = build_list_request(
+                    resource_group_name=resource_group_name,
+                    account_name=account_name,
+                    subscription_id=self._config.subscription_id,
+                    maxpagesize=maxpagesize,
+                    filter=filter,
+                    include=include,
+                    api_version=api_version,
+                    headers=_headers,
+                    params=_params,
+                )
+                _request.url = self._client.format_url(_request.url)
+
+            else:
+                # make call to next link with the client's api-version
+                _parsed_next_link = urllib.parse.urlparse(next_link)
+                _next_request_params = case_insensitive_dict(
+                    {
+                        key: [urllib.parse.quote(v) for v in value]
+                        for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items()
+                    }
+                )
+                _next_request_params["api-version"] = self._api_version
+                _request = HttpRequest(
+                    "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
+                )
+                _request.url = self._client.format_url(_request.url)
+                _request.method = "GET"
+            return _request
+
+        async def extract_data(pipeline_response):
+            deserialized = self._deserialize("EncryptionScopeListResult", pipeline_response)
+            list_of_elem = deserialized.value
+            if cls:
+                list_of_elem = cls(list_of_elem)  # type: ignore
+            return deserialized.next_link or None, AsyncList(list_of_elem)
+
+        async def get_next(next_link=None):
+            _request = prepare_request(next_link)
+
+            _stream = False
+            pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+                _request, stream=_stream, **kwargs
+            )
+            response = pipeline_response.http_response
+
+            if response.status_code not in [200]:
+                map_error(status_code=response.status_code, response=response, error_map=error_map)
+                raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+            return pipeline_response
+
+        return AsyncItemPaged(get_next, extract_data)
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/operations/_file_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/operations/_file_services_operations.py
new file mode 100644
index 000000000000..3f4e5136e370
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/operations/_file_services_operations.py
@@ -0,0 +1,483 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+from io import IOBase
+import sys
+from typing import Any, AsyncIterable, Callable, Dict, IO, Literal, Optional, TypeVar, Union, overload
+import urllib.parse
+
+from azure.core.async_paging import AsyncItemPaged, AsyncList
+from azure.core.exceptions import (
+    ClientAuthenticationError,
+    HttpResponseError,
+    ResourceExistsError,
+    ResourceNotFoundError,
+    ResourceNotModifiedError,
+    map_error,
+)
+from azure.core.pipeline import PipelineResponse
+from azure.core.rest import AsyncHttpResponse, HttpRequest
+from azure.core.tracing.decorator import distributed_trace
+from azure.core.tracing.decorator_async import distributed_trace_async
+from azure.core.utils import case_insensitive_dict
+from azure.mgmt.core.exceptions import ARMErrorFormat
+
+from ... import models as _models
+from ...operations._file_services_operations import (
+    build_get_service_properties_request,
+    build_get_service_usage_request,
+    build_list_request,
+    build_list_service_usages_request,
+    build_set_service_properties_request,
+)
+
+if sys.version_info >= (3, 9):
+    from collections.abc import MutableMapping
+else:
+    from typing import MutableMapping  # type: ignore
+T = TypeVar("T")
+ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
+
+
+class FileServicesOperations:
+    """
+    .. warning::
+        **DO NOT** instantiate this class directly.
+
+        Instead, you should access the following operations through
+        :class:`~azure.mgmt.storage.v2024_01_01.aio.StorageManagementClient`'s
+        :attr:`file_services` attribute.
+    """
+
+    models = _models
+
+    def __init__(self, *args, **kwargs) -> None:
+        input_args = list(args)
+        self._client = input_args.pop(0) if input_args else kwargs.pop("client")
+        self._config = input_args.pop(0) if input_args else kwargs.pop("config")
+        self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer")
+        self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer")
+        self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version")
+
+    @distributed_trace_async
+    async def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _models.FileServiceItems:
+        """List all file services in storage accounts.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :return: FileServiceItems or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.FileServiceItems
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.FileServiceItems] = kwargs.pop("cls", None)
+
+        _request = build_list_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("FileServiceItems", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @overload
+    async def set_service_properties(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        parameters: _models.FileServiceProperties,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.FileServiceProperties:
+        """Sets the properties of file services in storage accounts, including CORS (Cross-Origin Resource
+        Sharing) rules.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param parameters: The properties of file services in storage accounts, including CORS
+         (Cross-Origin Resource Sharing) rules. Required.
+        :type parameters: ~azure.mgmt.storage.v2024_01_01.models.FileServiceProperties
+        :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: FileServiceProperties or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.FileServiceProperties
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @overload
+    async def set_service_properties(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        parameters: IO[bytes],
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.FileServiceProperties:
+        """Sets the properties of file services in storage accounts, including CORS (Cross-Origin Resource
+        Sharing) rules.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param parameters: The properties of file services in storage accounts, including CORS
+         (Cross-Origin Resource Sharing) rules. Required.
+        :type parameters: IO[bytes]
+        :keyword content_type: Body Parameter content-type. Content type parameter for binary body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: FileServiceProperties or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.FileServiceProperties
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @distributed_trace_async
+    async def set_service_properties(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        parameters: Union[_models.FileServiceProperties, IO[bytes]],
+        **kwargs: Any
+    ) -> _models.FileServiceProperties:
+        """Sets the properties of file services in storage accounts, including CORS (Cross-Origin Resource
+        Sharing) rules.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param parameters: The properties of file services in storage accounts, including CORS
+         (Cross-Origin Resource Sharing) rules. Is either a FileServiceProperties type or a IO[bytes]
+         type. Required.
+        :type parameters: ~azure.mgmt.storage.v2024_01_01.models.FileServiceProperties or IO[bytes]
+        :return: FileServiceProperties or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.FileServiceProperties
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _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", self._api_version or "2024-01-01"))
+        file_services_name: Literal["default"] = kwargs.pop("file_services_name", "default")
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+        cls: ClsType[_models.FileServiceProperties] = kwargs.pop("cls", None)
+
+        content_type = content_type or "application/json"
+        _json = None
+        _content = None
+        if isinstance(parameters, (IOBase, bytes)):
+            _content = parameters
+        else:
+            _json = self._serialize.body(parameters, "FileServiceProperties")
+
+        _request = build_set_service_properties_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            file_services_name=file_services_name,
+            content_type=content_type,
+            json=_json,
+            content=_content,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("FileServiceProperties", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @distributed_trace_async
+    async def get_service_properties(
+        self, resource_group_name: str, account_name: str, **kwargs: Any
+    ) -> _models.FileServiceProperties:
+        """Gets the properties of file services in storage accounts, including CORS (Cross-Origin Resource
+        Sharing) rules.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :return: FileServiceProperties or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.FileServiceProperties
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        file_services_name: Literal["default"] = kwargs.pop("file_services_name", "default")
+        cls: ClsType[_models.FileServiceProperties] = kwargs.pop("cls", None)
+
+        _request = build_get_service_properties_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            file_services_name=file_services_name,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("FileServiceProperties", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @distributed_trace
+    def list_service_usages(
+        self, resource_group_name: str, account_name: str, maxpagesize: Optional[int] = None, **kwargs: Any
+    ) -> AsyncIterable["_models.FileServiceUsage"]:
+        """Gets the usages of file service in storage account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param maxpagesize: Optional, specifies the maximum number of file service usages to be
+         included in the list response. Default value is None.
+        :type maxpagesize: int
+        :return: An iterator like instance of either FileServiceUsage or the result of cls(response)
+        :rtype:
+         ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.storage.v2024_01_01.models.FileServiceUsage]
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        file_services_name: Literal["default"] = kwargs.pop("file_services_name", "default")
+        cls: ClsType[_models.FileServiceUsages] = kwargs.pop("cls", None)
+
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        def prepare_request(next_link=None):
+            if not next_link:
+
+                _request = build_list_service_usages_request(
+                    resource_group_name=resource_group_name,
+                    account_name=account_name,
+                    subscription_id=self._config.subscription_id,
+                    maxpagesize=maxpagesize,
+                    api_version=api_version,
+                    file_services_name=file_services_name,
+                    headers=_headers,
+                    params=_params,
+                )
+                _request.url = self._client.format_url(_request.url)
+
+            else:
+                # make call to next link with the client's api-version
+                _parsed_next_link = urllib.parse.urlparse(next_link)
+                _next_request_params = case_insensitive_dict(
+                    {
+                        key: [urllib.parse.quote(v) for v in value]
+                        for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items()
+                    }
+                )
+                _next_request_params["api-version"] = self._api_version
+                _request = HttpRequest(
+                    "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
+                )
+                _request.url = self._client.format_url(_request.url)
+                _request.method = "GET"
+            return _request
+
+        async def extract_data(pipeline_response):
+            deserialized = self._deserialize("FileServiceUsages", pipeline_response)
+            list_of_elem = deserialized.value
+            if cls:
+                list_of_elem = cls(list_of_elem)  # type: ignore
+            return deserialized.next_link or None, AsyncList(list_of_elem)
+
+        async def get_next(next_link=None):
+            _request = prepare_request(next_link)
+
+            _stream = False
+            pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+                _request, stream=_stream, **kwargs
+            )
+            response = pipeline_response.http_response
+
+            if response.status_code not in [200]:
+                map_error(status_code=response.status_code, response=response, error_map=error_map)
+                raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+            return pipeline_response
+
+        return AsyncItemPaged(get_next, extract_data)
+
+    @distributed_trace_async
+    async def get_service_usage(
+        self, resource_group_name: str, account_name: str, **kwargs: Any
+    ) -> _models.FileServiceUsage:
+        """Gets the usage of file service in storage account including account limits, file share limits
+        and constants used in recommendations and bursting formula.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :return: FileServiceUsage or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.FileServiceUsage
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        file_services_name: Literal["default"] = kwargs.pop("file_services_name", "default")
+        file_service_usages_name: Literal["default"] = kwargs.pop("file_service_usages_name", "default")
+        cls: ClsType[_models.FileServiceUsage] = kwargs.pop("cls", None)
+
+        _request = build_get_service_usage_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            file_services_name=file_services_name,
+            file_service_usages_name=file_service_usages_name,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("FileServiceUsage", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/operations/_file_shares_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/operations/_file_shares_operations.py
new file mode 100644
index 000000000000..9036825874f3
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/operations/_file_shares_operations.py
@@ -0,0 +1,988 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+from io import IOBase
+import sys
+from typing import Any, AsyncIterable, Callable, Dict, IO, Optional, TypeVar, Union, overload
+import urllib.parse
+
+from azure.core.async_paging import AsyncItemPaged, AsyncList
+from azure.core.exceptions import (
+    ClientAuthenticationError,
+    HttpResponseError,
+    ResourceExistsError,
+    ResourceNotFoundError,
+    ResourceNotModifiedError,
+    map_error,
+)
+from azure.core.pipeline import PipelineResponse
+from azure.core.rest import AsyncHttpResponse, HttpRequest
+from azure.core.tracing.decorator import distributed_trace
+from azure.core.tracing.decorator_async import distributed_trace_async
+from azure.core.utils import case_insensitive_dict
+from azure.mgmt.core.exceptions import ARMErrorFormat
+
+from ... import models as _models
+from ...operations._file_shares_operations import (
+    build_create_request,
+    build_delete_request,
+    build_get_request,
+    build_lease_request,
+    build_list_request,
+    build_restore_request,
+    build_update_request,
+)
+
+if sys.version_info >= (3, 9):
+    from collections.abc import MutableMapping
+else:
+    from typing import MutableMapping  # type: ignore
+T = TypeVar("T")
+ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
+
+
+class FileSharesOperations:
+    """
+    .. warning::
+        **DO NOT** instantiate this class directly.
+
+        Instead, you should access the following operations through
+        :class:`~azure.mgmt.storage.v2024_01_01.aio.StorageManagementClient`'s
+        :attr:`file_shares` attribute.
+    """
+
+    models = _models
+
+    def __init__(self, *args, **kwargs) -> None:
+        input_args = list(args)
+        self._client = input_args.pop(0) if input_args else kwargs.pop("client")
+        self._config = input_args.pop(0) if input_args else kwargs.pop("config")
+        self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer")
+        self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer")
+        self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version")
+
+    @distributed_trace
+    def list(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        maxpagesize: Optional[str] = None,
+        filter: Optional[str] = None,
+        expand: Optional[str] = None,
+        **kwargs: Any
+    ) -> AsyncIterable["_models.FileShareItem"]:
+        """Lists all shares.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param maxpagesize: Optional. Specified maximum number of shares that can be included in the
+         list. Default value is None.
+        :type maxpagesize: str
+        :param filter: Optional. When specified, only share names starting with the filter will be
+         listed. Default value is None.
+        :type filter: str
+        :param expand: Optional, used to expand the properties within share's properties. Valid values
+         are: deleted, snapshots. Should be passed as a string with delimiter ','. Default value is
+         None.
+        :type expand: str
+        :return: An iterator like instance of either FileShareItem or the result of cls(response)
+        :rtype:
+         ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.storage.v2024_01_01.models.FileShareItem]
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.FileShareItems] = kwargs.pop("cls", None)
+
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        def prepare_request(next_link=None):
+            if not next_link:
+
+                _request = build_list_request(
+                    resource_group_name=resource_group_name,
+                    account_name=account_name,
+                    subscription_id=self._config.subscription_id,
+                    maxpagesize=maxpagesize,
+                    filter=filter,
+                    expand=expand,
+                    api_version=api_version,
+                    headers=_headers,
+                    params=_params,
+                )
+                _request.url = self._client.format_url(_request.url)
+
+            else:
+                # make call to next link with the client's api-version
+                _parsed_next_link = urllib.parse.urlparse(next_link)
+                _next_request_params = case_insensitive_dict(
+                    {
+                        key: [urllib.parse.quote(v) for v in value]
+                        for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items()
+                    }
+                )
+                _next_request_params["api-version"] = self._api_version
+                _request = HttpRequest(
+                    "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
+                )
+                _request.url = self._client.format_url(_request.url)
+                _request.method = "GET"
+            return _request
+
+        async def extract_data(pipeline_response):
+            deserialized = self._deserialize("FileShareItems", pipeline_response)
+            list_of_elem = deserialized.value
+            if cls:
+                list_of_elem = cls(list_of_elem)  # type: ignore
+            return deserialized.next_link or None, AsyncList(list_of_elem)
+
+        async def get_next(next_link=None):
+            _request = prepare_request(next_link)
+
+            _stream = False
+            pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+                _request, stream=_stream, **kwargs
+            )
+            response = pipeline_response.http_response
+
+            if response.status_code not in [200]:
+                map_error(status_code=response.status_code, response=response, error_map=error_map)
+                raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+            return pipeline_response
+
+        return AsyncItemPaged(get_next, extract_data)
+
+    @overload
+    async def create(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        share_name: str,
+        file_share: _models.FileShare,
+        expand: Optional[str] = None,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.FileShare:
+        """Creates a new share under the specified account as described by request body. The share
+        resource includes metadata and properties for that share. It does not include a list of the
+        files contained by the share.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param share_name: The name of the file share within the specified storage account. File share
+         names must be between 3 and 63 characters in length and use numbers, lower-case letters and
+         dash (-) only. Every dash (-) character must be immediately preceded and followed by a letter
+         or number. Required.
+        :type share_name: str
+        :param file_share: Properties of the file share to create. Required.
+        :type file_share: ~azure.mgmt.storage.v2024_01_01.models.FileShare
+        :param expand: Optional, used to expand the properties within share's properties. Valid values
+         are: snapshots. Should be passed as a string with delimiter ','. Default value is None.
+        :type expand: str
+        :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: FileShare or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.FileShare
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @overload
+    async def create(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        share_name: str,
+        file_share: IO[bytes],
+        expand: Optional[str] = None,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.FileShare:
+        """Creates a new share under the specified account as described by request body. The share
+        resource includes metadata and properties for that share. It does not include a list of the
+        files contained by the share.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param share_name: The name of the file share within the specified storage account. File share
+         names must be between 3 and 63 characters in length and use numbers, lower-case letters and
+         dash (-) only. Every dash (-) character must be immediately preceded and followed by a letter
+         or number. Required.
+        :type share_name: str
+        :param file_share: Properties of the file share to create. Required.
+        :type file_share: IO[bytes]
+        :param expand: Optional, used to expand the properties within share's properties. Valid values
+         are: snapshots. Should be passed as a string with delimiter ','. Default value is None.
+        :type expand: str
+        :keyword content_type: Body Parameter content-type. Content type parameter for binary body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: FileShare or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.FileShare
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @distributed_trace_async
+    async def create(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        share_name: str,
+        file_share: Union[_models.FileShare, IO[bytes]],
+        expand: Optional[str] = None,
+        **kwargs: Any
+    ) -> _models.FileShare:
+        """Creates a new share under the specified account as described by request body. The share
+        resource includes metadata and properties for that share. It does not include a list of the
+        files contained by the share.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param share_name: The name of the file share within the specified storage account. File share
+         names must be between 3 and 63 characters in length and use numbers, lower-case letters and
+         dash (-) only. Every dash (-) character must be immediately preceded and followed by a letter
+         or number. Required.
+        :type share_name: str
+        :param file_share: Properties of the file share to create. Is either a FileShare type or a
+         IO[bytes] type. Required.
+        :type file_share: ~azure.mgmt.storage.v2024_01_01.models.FileShare or IO[bytes]
+        :param expand: Optional, used to expand the properties within share's properties. Valid values
+         are: snapshots. Should be passed as a string with delimiter ','. Default value is None.
+        :type expand: str
+        :return: FileShare or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.FileShare
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _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", self._api_version or "2024-01-01"))
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+        cls: ClsType[_models.FileShare] = kwargs.pop("cls", None)
+
+        content_type = content_type or "application/json"
+        _json = None
+        _content = None
+        if isinstance(file_share, (IOBase, bytes)):
+            _content = file_share
+        else:
+            _json = self._serialize.body(file_share, "FileShare")
+
+        _request = build_create_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            share_name=share_name,
+            subscription_id=self._config.subscription_id,
+            expand=expand,
+            api_version=api_version,
+            content_type=content_type,
+            json=_json,
+            content=_content,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200, 201]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("FileShare", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @overload
+    async def update(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        share_name: str,
+        file_share: _models.FileShare,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.FileShare:
+        """Updates share properties as specified in request body. Properties not mentioned in the request
+        will not be changed. Update fails if the specified share does not already exist.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param share_name: The name of the file share within the specified storage account. File share
+         names must be between 3 and 63 characters in length and use numbers, lower-case letters and
+         dash (-) only. Every dash (-) character must be immediately preceded and followed by a letter
+         or number. Required.
+        :type share_name: str
+        :param file_share: Properties to update for the file share. Required.
+        :type file_share: ~azure.mgmt.storage.v2024_01_01.models.FileShare
+        :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: FileShare or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.FileShare
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @overload
+    async def update(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        share_name: str,
+        file_share: IO[bytes],
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.FileShare:
+        """Updates share properties as specified in request body. Properties not mentioned in the request
+        will not be changed. Update fails if the specified share does not already exist.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param share_name: The name of the file share within the specified storage account. File share
+         names must be between 3 and 63 characters in length and use numbers, lower-case letters and
+         dash (-) only. Every dash (-) character must be immediately preceded and followed by a letter
+         or number. Required.
+        :type share_name: str
+        :param file_share: Properties to update for the file share. Required.
+        :type file_share: IO[bytes]
+        :keyword content_type: Body Parameter content-type. Content type parameter for binary body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: FileShare or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.FileShare
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @distributed_trace_async
+    async def update(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        share_name: str,
+        file_share: Union[_models.FileShare, IO[bytes]],
+        **kwargs: Any
+    ) -> _models.FileShare:
+        """Updates share properties as specified in request body. Properties not mentioned in the request
+        will not be changed. Update fails if the specified share does not already exist.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param share_name: The name of the file share within the specified storage account. File share
+         names must be between 3 and 63 characters in length and use numbers, lower-case letters and
+         dash (-) only. Every dash (-) character must be immediately preceded and followed by a letter
+         or number. Required.
+        :type share_name: str
+        :param file_share: Properties to update for the file share. Is either a FileShare type or a
+         IO[bytes] type. Required.
+        :type file_share: ~azure.mgmt.storage.v2024_01_01.models.FileShare or IO[bytes]
+        :return: FileShare or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.FileShare
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _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", self._api_version or "2024-01-01"))
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+        cls: ClsType[_models.FileShare] = kwargs.pop("cls", None)
+
+        content_type = content_type or "application/json"
+        _json = None
+        _content = None
+        if isinstance(file_share, (IOBase, bytes)):
+            _content = file_share
+        else:
+            _json = self._serialize.body(file_share, "FileShare")
+
+        _request = build_update_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            share_name=share_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            content_type=content_type,
+            json=_json,
+            content=_content,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("FileShare", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @distributed_trace_async
+    async def get(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        share_name: str,
+        expand: Optional[str] = None,
+        x_ms_snapshot: Optional[str] = None,
+        **kwargs: Any
+    ) -> _models.FileShare:
+        """Gets properties of a specified share.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param share_name: The name of the file share within the specified storage account. File share
+         names must be between 3 and 63 characters in length and use numbers, lower-case letters and
+         dash (-) only. Every dash (-) character must be immediately preceded and followed by a letter
+         or number. Required.
+        :type share_name: str
+        :param expand: Optional, used to expand the properties within share's properties. Valid values
+         are: stats. Should be passed as a string with delimiter ','. Default value is None.
+        :type expand: str
+        :param x_ms_snapshot: Optional, used to retrieve properties of a snapshot. Default value is
+         None.
+        :type x_ms_snapshot: str
+        :return: FileShare or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.FileShare
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.FileShare] = kwargs.pop("cls", None)
+
+        _request = build_get_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            share_name=share_name,
+            subscription_id=self._config.subscription_id,
+            expand=expand,
+            x_ms_snapshot=x_ms_snapshot,
+            api_version=api_version,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("FileShare", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @distributed_trace_async
+    async def delete(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        share_name: str,
+        x_ms_snapshot: Optional[str] = None,
+        include: Optional[str] = None,
+        **kwargs: Any
+    ) -> None:
+        """Deletes specified share under its account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param share_name: The name of the file share within the specified storage account. File share
+         names must be between 3 and 63 characters in length and use numbers, lower-case letters and
+         dash (-) only. Every dash (-) character must be immediately preceded and followed by a letter
+         or number. Required.
+        :type share_name: str
+        :param x_ms_snapshot: Optional, used to delete a snapshot. Default value is None.
+        :type x_ms_snapshot: str
+        :param include: Optional. Valid values are: snapshots, leased-snapshots, none. The default
+         value is snapshots. For 'snapshots', the file share is deleted including all of its file share
+         snapshots. If the file share contains leased-snapshots, the deletion fails. For
+         'leased-snapshots', the file share is deleted included all of its file share snapshots
+         (leased/unleased). For 'none', the file share is deleted if it has no share snapshots. If the
+         file share contains any snapshots (leased or unleased), the deletion fails. Default value is
+         None.
+        :type include: str
+        :return: None or the result of cls(response)
+        :rtype: None
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[None] = kwargs.pop("cls", None)
+
+        _request = build_delete_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            share_name=share_name,
+            subscription_id=self._config.subscription_id,
+            x_ms_snapshot=x_ms_snapshot,
+            include=include,
+            api_version=api_version,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200, 204]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        if cls:
+            return cls(pipeline_response, None, {})  # type: ignore
+
+    @overload
+    async def restore(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        share_name: str,
+        deleted_share: _models.DeletedShare,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> None:
+        """Restore a file share within a valid retention days if share soft delete is enabled.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param share_name: The name of the file share within the specified storage account. File share
+         names must be between 3 and 63 characters in length and use numbers, lower-case letters and
+         dash (-) only. Every dash (-) character must be immediately preceded and followed by a letter
+         or number. Required.
+        :type share_name: str
+        :param deleted_share: Required.
+        :type deleted_share: ~azure.mgmt.storage.v2024_01_01.models.DeletedShare
+        :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: None or the result of cls(response)
+        :rtype: None
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @overload
+    async def restore(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        share_name: str,
+        deleted_share: IO[bytes],
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> None:
+        """Restore a file share within a valid retention days if share soft delete is enabled.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param share_name: The name of the file share within the specified storage account. File share
+         names must be between 3 and 63 characters in length and use numbers, lower-case letters and
+         dash (-) only. Every dash (-) character must be immediately preceded and followed by a letter
+         or number. Required.
+        :type share_name: str
+        :param deleted_share: Required.
+        :type deleted_share: IO[bytes]
+        :keyword content_type: Body Parameter content-type. Content type parameter for binary body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: None or the result of cls(response)
+        :rtype: None
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @distributed_trace_async
+    async def restore(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        share_name: str,
+        deleted_share: Union[_models.DeletedShare, IO[bytes]],
+        **kwargs: Any
+    ) -> None:
+        """Restore a file share within a valid retention days if share soft delete is enabled.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param share_name: The name of the file share within the specified storage account. File share
+         names must be between 3 and 63 characters in length and use numbers, lower-case letters and
+         dash (-) only. Every dash (-) character must be immediately preceded and followed by a letter
+         or number. Required.
+        :type share_name: str
+        :param deleted_share: Is either a DeletedShare type or a IO[bytes] type. Required.
+        :type deleted_share: ~azure.mgmt.storage.v2024_01_01.models.DeletedShare or IO[bytes]
+        :return: None or the result of cls(response)
+        :rtype: None
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _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", self._api_version or "2024-01-01"))
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+        cls: ClsType[None] = kwargs.pop("cls", None)
+
+        content_type = content_type or "application/json"
+        _json = None
+        _content = None
+        if isinstance(deleted_share, (IOBase, bytes)):
+            _content = deleted_share
+        else:
+            _json = self._serialize.body(deleted_share, "DeletedShare")
+
+        _request = build_restore_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            share_name=share_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            content_type=content_type,
+            json=_json,
+            content=_content,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        if cls:
+            return cls(pipeline_response, None, {})  # type: ignore
+
+    @overload
+    async def lease(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        share_name: str,
+        x_ms_snapshot: Optional[str] = None,
+        parameters: Optional[_models.LeaseShareRequest] = None,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.LeaseShareResponse:
+        """The Lease Share operation establishes and manages a lock on a share for delete operations. The
+        lock duration can be 15 to 60 seconds, or can be infinite.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param share_name: The name of the file share within the specified storage account. File share
+         names must be between 3 and 63 characters in length and use numbers, lower-case letters and
+         dash (-) only. Every dash (-) character must be immediately preceded and followed by a letter
+         or number. Required.
+        :type share_name: str
+        :param x_ms_snapshot: Optional. Specify the snapshot time to lease a snapshot. Default value is
+         None.
+        :type x_ms_snapshot: str
+        :param parameters: Lease Share request body. Default value is None.
+        :type parameters: ~azure.mgmt.storage.v2024_01_01.models.LeaseShareRequest
+        :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: LeaseShareResponse or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.LeaseShareResponse
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @overload
+    async def lease(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        share_name: str,
+        x_ms_snapshot: Optional[str] = None,
+        parameters: Optional[IO[bytes]] = None,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.LeaseShareResponse:
+        """The Lease Share operation establishes and manages a lock on a share for delete operations. The
+        lock duration can be 15 to 60 seconds, or can be infinite.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param share_name: The name of the file share within the specified storage account. File share
+         names must be between 3 and 63 characters in length and use numbers, lower-case letters and
+         dash (-) only. Every dash (-) character must be immediately preceded and followed by a letter
+         or number. Required.
+        :type share_name: str
+        :param x_ms_snapshot: Optional. Specify the snapshot time to lease a snapshot. Default value is
+         None.
+        :type x_ms_snapshot: str
+        :param parameters: Lease Share request body. Default value is None.
+        :type parameters: IO[bytes]
+        :keyword content_type: Body Parameter content-type. Content type parameter for binary body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: LeaseShareResponse or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.LeaseShareResponse
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @distributed_trace_async
+    async def lease(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        share_name: str,
+        x_ms_snapshot: Optional[str] = None,
+        parameters: Optional[Union[_models.LeaseShareRequest, IO[bytes]]] = None,
+        **kwargs: Any
+    ) -> _models.LeaseShareResponse:
+        """The Lease Share operation establishes and manages a lock on a share for delete operations. The
+        lock duration can be 15 to 60 seconds, or can be infinite.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param share_name: The name of the file share within the specified storage account. File share
+         names must be between 3 and 63 characters in length and use numbers, lower-case letters and
+         dash (-) only. Every dash (-) character must be immediately preceded and followed by a letter
+         or number. Required.
+        :type share_name: str
+        :param x_ms_snapshot: Optional. Specify the snapshot time to lease a snapshot. Default value is
+         None.
+        :type x_ms_snapshot: str
+        :param parameters: Lease Share request body. Is either a LeaseShareRequest type or a IO[bytes]
+         type. Default value is None.
+        :type parameters: ~azure.mgmt.storage.v2024_01_01.models.LeaseShareRequest or IO[bytes]
+        :return: LeaseShareResponse or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.LeaseShareResponse
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _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", self._api_version or "2024-01-01"))
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+        cls: ClsType[_models.LeaseShareResponse] = kwargs.pop("cls", None)
+
+        content_type = content_type or "application/json"
+        _json = None
+        _content = None
+        if isinstance(parameters, (IOBase, bytes)):
+            _content = parameters
+        else:
+            if parameters is not None:
+                _json = self._serialize.body(parameters, "LeaseShareRequest")
+            else:
+                _json = None
+
+        _request = build_lease_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            share_name=share_name,
+            subscription_id=self._config.subscription_id,
+            x_ms_snapshot=x_ms_snapshot,
+            api_version=api_version,
+            content_type=content_type,
+            json=_json,
+            content=_content,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        response_headers = {}
+        response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
+
+        deserialized = self._deserialize("LeaseShareResponse", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, response_headers)  # type: ignore
+
+        return deserialized  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/operations/_local_users_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/operations/_local_users_operations.py
new file mode 100644
index 000000000000..82d364dfd4b5
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/operations/_local_users_operations.py
@@ -0,0 +1,571 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+from io import IOBase
+import sys
+from typing import Any, AsyncIterable, Callable, Dict, IO, Optional, TypeVar, Union, overload
+import urllib.parse
+
+from azure.core.async_paging import AsyncItemPaged, AsyncList
+from azure.core.exceptions import (
+    ClientAuthenticationError,
+    HttpResponseError,
+    ResourceExistsError,
+    ResourceNotFoundError,
+    ResourceNotModifiedError,
+    map_error,
+)
+from azure.core.pipeline import PipelineResponse
+from azure.core.rest import AsyncHttpResponse, HttpRequest
+from azure.core.tracing.decorator import distributed_trace
+from azure.core.tracing.decorator_async import distributed_trace_async
+from azure.core.utils import case_insensitive_dict
+from azure.mgmt.core.exceptions import ARMErrorFormat
+
+from ... import models as _models
+from ...operations._local_users_operations import (
+    build_create_or_update_request,
+    build_delete_request,
+    build_get_request,
+    build_list_keys_request,
+    build_list_request,
+    build_regenerate_password_request,
+)
+
+if sys.version_info >= (3, 9):
+    from collections.abc import MutableMapping
+else:
+    from typing import MutableMapping  # type: ignore
+T = TypeVar("T")
+ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
+
+
+class LocalUsersOperations:
+    """
+    .. warning::
+        **DO NOT** instantiate this class directly.
+
+        Instead, you should access the following operations through
+        :class:`~azure.mgmt.storage.v2024_01_01.aio.StorageManagementClient`'s
+        :attr:`local_users` attribute.
+    """
+
+    models = _models
+
+    def __init__(self, *args, **kwargs) -> None:
+        input_args = list(args)
+        self._client = input_args.pop(0) if input_args else kwargs.pop("client")
+        self._config = input_args.pop(0) if input_args else kwargs.pop("config")
+        self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer")
+        self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer")
+        self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version")
+
+    @distributed_trace
+    def list(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        maxpagesize: Optional[int] = None,
+        filter: Optional[str] = None,
+        include: Optional[Union[str, _models.ListLocalUserIncludeParam]] = None,
+        **kwargs: Any
+    ) -> AsyncIterable["_models.LocalUser"]:
+        """List the local users associated with the storage account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param maxpagesize: Optional, specifies the maximum number of local users that will be included
+         in the list response. Default value is None.
+        :type maxpagesize: int
+        :param filter: Optional. When specified, only local user names starting with the filter will be
+         listed. Default value is None.
+        :type filter: str
+        :param include: Optional, when specified, will list local users enabled for the specific
+         protocol. Lists all users by default. "nfsv3" Default value is None.
+        :type include: str or ~azure.mgmt.storage.v2024_01_01.models.ListLocalUserIncludeParam
+        :return: An iterator like instance of either LocalUser or the result of cls(response)
+        :rtype:
+         ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.storage.v2024_01_01.models.LocalUser]
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.LocalUsers] = kwargs.pop("cls", None)
+
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        def prepare_request(next_link=None):
+            if not next_link:
+
+                _request = build_list_request(
+                    resource_group_name=resource_group_name,
+                    account_name=account_name,
+                    subscription_id=self._config.subscription_id,
+                    maxpagesize=maxpagesize,
+                    filter=filter,
+                    include=include,
+                    api_version=api_version,
+                    headers=_headers,
+                    params=_params,
+                )
+                _request.url = self._client.format_url(_request.url)
+
+            else:
+                # make call to next link with the client's api-version
+                _parsed_next_link = urllib.parse.urlparse(next_link)
+                _next_request_params = case_insensitive_dict(
+                    {
+                        key: [urllib.parse.quote(v) for v in value]
+                        for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items()
+                    }
+                )
+                _next_request_params["api-version"] = self._api_version
+                _request = HttpRequest(
+                    "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
+                )
+                _request.url = self._client.format_url(_request.url)
+                _request.method = "GET"
+            return _request
+
+        async def extract_data(pipeline_response):
+            deserialized = self._deserialize("LocalUsers", pipeline_response)
+            list_of_elem = deserialized.value
+            if cls:
+                list_of_elem = cls(list_of_elem)  # type: ignore
+            return None, AsyncList(list_of_elem)
+
+        async def get_next(next_link=None):
+            _request = prepare_request(next_link)
+
+            _stream = False
+            pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+                _request, stream=_stream, **kwargs
+            )
+            response = pipeline_response.http_response
+
+            if response.status_code not in [200]:
+                map_error(status_code=response.status_code, response=response, error_map=error_map)
+                error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
+                raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
+
+            return pipeline_response
+
+        return AsyncItemPaged(get_next, extract_data)
+
+    @distributed_trace_async
+    async def get(self, resource_group_name: str, account_name: str, username: str, **kwargs: Any) -> _models.LocalUser:
+        """Get the local user of the storage account by username.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param username: The name of local user. The username must contain lowercase letters and
+         numbers only. It must be unique only within the storage account. Required.
+        :type username: str
+        :return: LocalUser or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.LocalUser
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.LocalUser] = kwargs.pop("cls", None)
+
+        _request = build_get_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            username=username,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
+            raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("LocalUser", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @overload
+    async def create_or_update(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        username: str,
+        properties: _models.LocalUser,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.LocalUser:
+        """Create or update the properties of a local user associated with the storage account. Properties
+        for NFSv3 enablement and extended groups cannot be set with other properties.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param username: The name of local user. The username must contain lowercase letters and
+         numbers only. It must be unique only within the storage account. Required.
+        :type username: str
+        :param properties: The local user associated with a storage account. Required.
+        :type properties: ~azure.mgmt.storage.v2024_01_01.models.LocalUser
+        :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: LocalUser or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.LocalUser
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @overload
+    async def create_or_update(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        username: str,
+        properties: IO[bytes],
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.LocalUser:
+        """Create or update the properties of a local user associated with the storage account. Properties
+        for NFSv3 enablement and extended groups cannot be set with other properties.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param username: The name of local user. The username must contain lowercase letters and
+         numbers only. It must be unique only within the storage account. Required.
+        :type username: str
+        :param properties: The local user associated with a storage account. Required.
+        :type properties: IO[bytes]
+        :keyword content_type: Body Parameter content-type. Content type parameter for binary body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: LocalUser or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.LocalUser
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @distributed_trace_async
+    async def create_or_update(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        username: str,
+        properties: Union[_models.LocalUser, IO[bytes]],
+        **kwargs: Any
+    ) -> _models.LocalUser:
+        """Create or update the properties of a local user associated with the storage account. Properties
+        for NFSv3 enablement and extended groups cannot be set with other properties.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param username: The name of local user. The username must contain lowercase letters and
+         numbers only. It must be unique only within the storage account. Required.
+        :type username: str
+        :param properties: The local user associated with a storage account. Is either a LocalUser type
+         or a IO[bytes] type. Required.
+        :type properties: ~azure.mgmt.storage.v2024_01_01.models.LocalUser or IO[bytes]
+        :return: LocalUser or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.LocalUser
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _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", self._api_version or "2024-01-01"))
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+        cls: ClsType[_models.LocalUser] = kwargs.pop("cls", None)
+
+        content_type = content_type or "application/json"
+        _json = None
+        _content = None
+        if isinstance(properties, (IOBase, bytes)):
+            _content = properties
+        else:
+            _json = self._serialize.body(properties, "LocalUser")
+
+        _request = build_create_or_update_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            username=username,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            content_type=content_type,
+            json=_json,
+            content=_content,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
+            raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("LocalUser", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @distributed_trace_async
+    async def delete(self, resource_group_name: str, account_name: str, username: str, **kwargs: Any) -> None:
+        """Deletes the local user associated with the specified storage account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param username: The name of local user. The username must contain lowercase letters and
+         numbers only. It must be unique only within the storage account. Required.
+        :type username: str
+        :return: None or the result of cls(response)
+        :rtype: None
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[None] = kwargs.pop("cls", None)
+
+        _request = build_delete_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            username=username,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200, 204]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
+            raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
+
+        if cls:
+            return cls(pipeline_response, None, {})  # type: ignore
+
+    @distributed_trace_async
+    async def list_keys(
+        self, resource_group_name: str, account_name: str, username: str, **kwargs: Any
+    ) -> _models.LocalUserKeys:
+        """List SSH authorized keys and shared key of the local user.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param username: The name of local user. The username must contain lowercase letters and
+         numbers only. It must be unique only within the storage account. Required.
+        :type username: str
+        :return: LocalUserKeys or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.LocalUserKeys
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.LocalUserKeys] = kwargs.pop("cls", None)
+
+        _request = build_list_keys_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            username=username,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
+            raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("LocalUserKeys", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @distributed_trace_async
+    async def regenerate_password(
+        self, resource_group_name: str, account_name: str, username: str, **kwargs: Any
+    ) -> _models.LocalUserRegeneratePasswordResult:
+        """Regenerate the local user SSH password.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param username: The name of local user. The username must contain lowercase letters and
+         numbers only. It must be unique only within the storage account. Required.
+        :type username: str
+        :return: LocalUserRegeneratePasswordResult or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.LocalUserRegeneratePasswordResult
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.LocalUserRegeneratePasswordResult] = kwargs.pop("cls", None)
+
+        _request = build_regenerate_password_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            username=username,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
+            raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("LocalUserRegeneratePasswordResult", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/operations/_management_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/operations/_management_policies_operations.py
new file mode 100644
index 000000000000..cdd4f6e61e7a
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/operations/_management_policies_operations.py
@@ -0,0 +1,343 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+from io import IOBase
+import sys
+from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload
+
+from azure.core.exceptions import (
+    ClientAuthenticationError,
+    HttpResponseError,
+    ResourceExistsError,
+    ResourceNotFoundError,
+    ResourceNotModifiedError,
+    map_error,
+)
+from azure.core.pipeline import PipelineResponse
+from azure.core.rest import AsyncHttpResponse, HttpRequest
+from azure.core.tracing.decorator_async import distributed_trace_async
+from azure.core.utils import case_insensitive_dict
+from azure.mgmt.core.exceptions import ARMErrorFormat
+
+from ... import models as _models
+from ...operations._management_policies_operations import (
+    build_create_or_update_request,
+    build_delete_request,
+    build_get_request,
+)
+
+if sys.version_info >= (3, 9):
+    from collections.abc import MutableMapping
+else:
+    from typing import MutableMapping  # type: ignore
+T = TypeVar("T")
+ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
+
+
+class ManagementPoliciesOperations:
+    """
+    .. warning::
+        **DO NOT** instantiate this class directly.
+
+        Instead, you should access the following operations through
+        :class:`~azure.mgmt.storage.v2024_01_01.aio.StorageManagementClient`'s
+        :attr:`management_policies` attribute.
+    """
+
+    models = _models
+
+    def __init__(self, *args, **kwargs) -> None:
+        input_args = list(args)
+        self._client = input_args.pop(0) if input_args else kwargs.pop("client")
+        self._config = input_args.pop(0) if input_args else kwargs.pop("config")
+        self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer")
+        self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer")
+        self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version")
+
+    @distributed_trace_async
+    async def get(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        management_policy_name: Union[str, _models.ManagementPolicyName],
+        **kwargs: Any
+    ) -> _models.ManagementPolicy:
+        """Gets the managementpolicy associated with the specified storage account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param management_policy_name: The name of the Storage Account Management Policy. It should
+         always be 'default'. "default" Required.
+        :type management_policy_name: str or
+         ~azure.mgmt.storage.v2024_01_01.models.ManagementPolicyName
+        :return: ManagementPolicy or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.ManagementPolicy
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.ManagementPolicy] = kwargs.pop("cls", None)
+
+        _request = build_get_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            management_policy_name=management_policy_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("ManagementPolicy", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @overload
+    async def create_or_update(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        management_policy_name: Union[str, _models.ManagementPolicyName],
+        properties: _models.ManagementPolicy,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.ManagementPolicy:
+        """Sets the managementpolicy to the specified storage account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param management_policy_name: The name of the Storage Account Management Policy. It should
+         always be 'default'. "default" Required.
+        :type management_policy_name: str or
+         ~azure.mgmt.storage.v2024_01_01.models.ManagementPolicyName
+        :param properties: The ManagementPolicy set to a storage account. Required.
+        :type properties: ~azure.mgmt.storage.v2024_01_01.models.ManagementPolicy
+        :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: ManagementPolicy or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.ManagementPolicy
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @overload
+    async def create_or_update(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        management_policy_name: Union[str, _models.ManagementPolicyName],
+        properties: IO[bytes],
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.ManagementPolicy:
+        """Sets the managementpolicy to the specified storage account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param management_policy_name: The name of the Storage Account Management Policy. It should
+         always be 'default'. "default" Required.
+        :type management_policy_name: str or
+         ~azure.mgmt.storage.v2024_01_01.models.ManagementPolicyName
+        :param properties: The ManagementPolicy set to a storage account. Required.
+        :type properties: IO[bytes]
+        :keyword content_type: Body Parameter content-type. Content type parameter for binary body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: ManagementPolicy or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.ManagementPolicy
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @distributed_trace_async
+    async def create_or_update(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        management_policy_name: Union[str, _models.ManagementPolicyName],
+        properties: Union[_models.ManagementPolicy, IO[bytes]],
+        **kwargs: Any
+    ) -> _models.ManagementPolicy:
+        """Sets the managementpolicy to the specified storage account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param management_policy_name: The name of the Storage Account Management Policy. It should
+         always be 'default'. "default" Required.
+        :type management_policy_name: str or
+         ~azure.mgmt.storage.v2024_01_01.models.ManagementPolicyName
+        :param properties: The ManagementPolicy set to a storage account. Is either a ManagementPolicy
+         type or a IO[bytes] type. Required.
+        :type properties: ~azure.mgmt.storage.v2024_01_01.models.ManagementPolicy or IO[bytes]
+        :return: ManagementPolicy or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.ManagementPolicy
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _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", self._api_version or "2024-01-01"))
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+        cls: ClsType[_models.ManagementPolicy] = kwargs.pop("cls", None)
+
+        content_type = content_type or "application/json"
+        _json = None
+        _content = None
+        if isinstance(properties, (IOBase, bytes)):
+            _content = properties
+        else:
+            _json = self._serialize.body(properties, "ManagementPolicy")
+
+        _request = build_create_or_update_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            management_policy_name=management_policy_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            content_type=content_type,
+            json=_json,
+            content=_content,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("ManagementPolicy", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @distributed_trace_async
+    async def delete(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        management_policy_name: Union[str, _models.ManagementPolicyName],
+        **kwargs: Any
+    ) -> None:
+        """Deletes the managementpolicy associated with the specified storage account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param management_policy_name: The name of the Storage Account Management Policy. It should
+         always be 'default'. "default" Required.
+        :type management_policy_name: str or
+         ~azure.mgmt.storage.v2024_01_01.models.ManagementPolicyName
+        :return: None or the result of cls(response)
+        :rtype: None
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[None] = kwargs.pop("cls", None)
+
+        _request = build_delete_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            management_policy_name=management_policy_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200, 204]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        if cls:
+            return cls(pipeline_response, None, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/operations/_network_security_perimeter_configurations_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/operations/_network_security_perimeter_configurations_operations.py
new file mode 100644
index 000000000000..de73ff3edf45
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/operations/_network_security_perimeter_configurations_operations.py
@@ -0,0 +1,348 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+import sys
+from typing import Any, AsyncIterable, AsyncIterator, Callable, Dict, Optional, TypeVar, Union, cast
+import urllib.parse
+
+from azure.core.async_paging import AsyncItemPaged, AsyncList
+from azure.core.exceptions import (
+    ClientAuthenticationError,
+    HttpResponseError,
+    ResourceExistsError,
+    ResourceNotFoundError,
+    ResourceNotModifiedError,
+    StreamClosedError,
+    StreamConsumedError,
+    map_error,
+)
+from azure.core.pipeline import PipelineResponse
+from azure.core.polling import AsyncLROPoller, AsyncNoPolling, AsyncPollingMethod
+from azure.core.rest import AsyncHttpResponse, HttpRequest
+from azure.core.tracing.decorator import distributed_trace
+from azure.core.tracing.decorator_async import distributed_trace_async
+from azure.core.utils import case_insensitive_dict
+from azure.mgmt.core.exceptions import ARMErrorFormat
+from azure.mgmt.core.polling.async_arm_polling import AsyncARMPolling
+
+from ... import models as _models
+from ...operations._network_security_perimeter_configurations_operations import (
+    build_get_request,
+    build_list_request,
+    build_reconcile_request,
+)
+
+if sys.version_info >= (3, 9):
+    from collections.abc import MutableMapping
+else:
+    from typing import MutableMapping  # type: ignore
+T = TypeVar("T")
+ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
+
+
+class NetworkSecurityPerimeterConfigurationsOperations:  # pylint: disable=name-too-long
+    """
+    .. warning::
+        **DO NOT** instantiate this class directly.
+
+        Instead, you should access the following operations through
+        :class:`~azure.mgmt.storage.v2024_01_01.aio.StorageManagementClient`'s
+        :attr:`network_security_perimeter_configurations` attribute.
+    """
+
+    models = _models
+
+    def __init__(self, *args, **kwargs) -> None:
+        input_args = list(args)
+        self._client = input_args.pop(0) if input_args else kwargs.pop("client")
+        self._config = input_args.pop(0) if input_args else kwargs.pop("config")
+        self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer")
+        self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer")
+        self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version")
+
+    @distributed_trace
+    def list(
+        self, resource_group_name: str, account_name: str, **kwargs: Any
+    ) -> AsyncIterable["_models.NetworkSecurityPerimeterConfiguration"]:
+        # pylint: disable=line-too-long
+        """Gets list of effective NetworkSecurityPerimeterConfiguration for storage account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :return: An iterator like instance of either NetworkSecurityPerimeterConfiguration or the
+         result of cls(response)
+        :rtype:
+         ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.storage.v2024_01_01.models.NetworkSecurityPerimeterConfiguration]
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.NetworkSecurityPerimeterConfigurationList] = kwargs.pop("cls", None)
+
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        def prepare_request(next_link=None):
+            if not next_link:
+
+                _request = build_list_request(
+                    resource_group_name=resource_group_name,
+                    account_name=account_name,
+                    subscription_id=self._config.subscription_id,
+                    api_version=api_version,
+                    headers=_headers,
+                    params=_params,
+                )
+                _request.url = self._client.format_url(_request.url)
+
+            else:
+                # make call to next link with the client's api-version
+                _parsed_next_link = urllib.parse.urlparse(next_link)
+                _next_request_params = case_insensitive_dict(
+                    {
+                        key: [urllib.parse.quote(v) for v in value]
+                        for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items()
+                    }
+                )
+                _next_request_params["api-version"] = self._api_version
+                _request = HttpRequest(
+                    "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
+                )
+                _request.url = self._client.format_url(_request.url)
+                _request.method = "GET"
+            return _request
+
+        async def extract_data(pipeline_response):
+            deserialized = self._deserialize("NetworkSecurityPerimeterConfigurationList", pipeline_response)
+            list_of_elem = deserialized.value
+            if cls:
+                list_of_elem = cls(list_of_elem)  # type: ignore
+            return None, AsyncList(list_of_elem)
+
+        async def get_next(next_link=None):
+            _request = prepare_request(next_link)
+
+            _stream = False
+            pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+                _request, stream=_stream, **kwargs
+            )
+            response = pipeline_response.http_response
+
+            if response.status_code not in [200]:
+                map_error(status_code=response.status_code, response=response, error_map=error_map)
+                error = self._deserialize.failsafe_deserialize(_models.ErrorResponseAutoGenerated, pipeline_response)
+                raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
+
+            return pipeline_response
+
+        return AsyncItemPaged(get_next, extract_data)
+
+    @distributed_trace_async
+    async def get(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        network_security_perimeter_configuration_name: str,
+        **kwargs: Any
+    ) -> _models.NetworkSecurityPerimeterConfiguration:
+        """Gets effective NetworkSecurityPerimeterConfiguration for association.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param network_security_perimeter_configuration_name: The name for Network Security Perimeter
+         configuration. Required.
+        :type network_security_perimeter_configuration_name: str
+        :return: NetworkSecurityPerimeterConfiguration or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.NetworkSecurityPerimeterConfiguration
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.NetworkSecurityPerimeterConfiguration] = kwargs.pop("cls", None)
+
+        _request = build_get_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            network_security_perimeter_configuration_name=network_security_perimeter_configuration_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            error = self._deserialize.failsafe_deserialize(_models.ErrorResponseAutoGenerated, pipeline_response)
+            raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("NetworkSecurityPerimeterConfiguration", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    async def _reconcile_initial(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        network_security_perimeter_configuration_name: str,
+        **kwargs: Any
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
+
+        _request = build_reconcile_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            network_security_perimeter_configuration_name=network_security_perimeter_configuration_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
+        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            error = self._deserialize.failsafe_deserialize(_models.ErrorResponseAutoGenerated, pipeline_response)
+            raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
+
+        response_headers = {}
+        response_headers["Location"] = self._deserialize("str", response.headers.get("Location"))
+
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
+        if cls:
+            return cls(pipeline_response, deserialized, response_headers)  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @distributed_trace_async
+    async def begin_reconcile(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        network_security_perimeter_configuration_name: str,
+        **kwargs: Any
+    ) -> AsyncLROPoller[None]:
+        """Refreshes any information about the association.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param network_security_perimeter_configuration_name: The name for Network Security Perimeter
+         configuration. Required.
+        :type network_security_perimeter_configuration_name: str
+        :return: An instance of AsyncLROPoller that returns either None or the result of cls(response)
+        :rtype: ~azure.core.polling.AsyncLROPoller[None]
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[None] = kwargs.pop("cls", None)
+        polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True)
+        lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
+        cont_token: Optional[str] = kwargs.pop("continuation_token", None)
+        if cont_token is None:
+            raw_result = await self._reconcile_initial(
+                resource_group_name=resource_group_name,
+                account_name=account_name,
+                network_security_perimeter_configuration_name=network_security_perimeter_configuration_name,
+                api_version=api_version,
+                cls=lambda x, y, z: x,
+                headers=_headers,
+                params=_params,
+                **kwargs
+            )
+            await raw_result.http_response.read()  # type: ignore
+        kwargs.pop("error_map", None)
+
+        def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
+            if cls:
+                return cls(pipeline_response, None, {})  # type: ignore
+
+        if polling is True:
+            polling_method: AsyncPollingMethod = cast(
+                AsyncPollingMethod, AsyncARMPolling(lro_delay, lro_options={"final-state-via": "location"}, **kwargs)
+            )
+        elif polling is False:
+            polling_method = cast(AsyncPollingMethod, AsyncNoPolling())
+        else:
+            polling_method = polling
+        if cont_token:
+            return AsyncLROPoller[None].from_continuation_token(
+                polling_method=polling_method,
+                continuation_token=cont_token,
+                client=self._client,
+                deserialization_callback=get_long_running_output,
+            )
+        return AsyncLROPoller[None](self._client, raw_result, get_long_running_output, polling_method)  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/operations/_object_replication_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/operations/_object_replication_policies_operations.py
new file mode 100644
index 000000000000..8bf620401bdc
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/operations/_object_replication_policies_operations.py
@@ -0,0 +1,438 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+from io import IOBase
+import sys
+from typing import Any, AsyncIterable, Callable, Dict, IO, Optional, TypeVar, Union, overload
+import urllib.parse
+
+from azure.core.async_paging import AsyncItemPaged, AsyncList
+from azure.core.exceptions import (
+    ClientAuthenticationError,
+    HttpResponseError,
+    ResourceExistsError,
+    ResourceNotFoundError,
+    ResourceNotModifiedError,
+    map_error,
+)
+from azure.core.pipeline import PipelineResponse
+from azure.core.rest import AsyncHttpResponse, HttpRequest
+from azure.core.tracing.decorator import distributed_trace
+from azure.core.tracing.decorator_async import distributed_trace_async
+from azure.core.utils import case_insensitive_dict
+from azure.mgmt.core.exceptions import ARMErrorFormat
+
+from ... import models as _models
+from ...operations._object_replication_policies_operations import (
+    build_create_or_update_request,
+    build_delete_request,
+    build_get_request,
+    build_list_request,
+)
+
+if sys.version_info >= (3, 9):
+    from collections.abc import MutableMapping
+else:
+    from typing import MutableMapping  # type: ignore
+T = TypeVar("T")
+ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
+
+
+class ObjectReplicationPoliciesOperations:
+    """
+    .. warning::
+        **DO NOT** instantiate this class directly.
+
+        Instead, you should access the following operations through
+        :class:`~azure.mgmt.storage.v2024_01_01.aio.StorageManagementClient`'s
+        :attr:`object_replication_policies` attribute.
+    """
+
+    models = _models
+
+    def __init__(self, *args, **kwargs) -> None:
+        input_args = list(args)
+        self._client = input_args.pop(0) if input_args else kwargs.pop("client")
+        self._config = input_args.pop(0) if input_args else kwargs.pop("config")
+        self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer")
+        self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer")
+        self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version")
+
+    @distributed_trace
+    def list(
+        self, resource_group_name: str, account_name: str, **kwargs: Any
+    ) -> AsyncIterable["_models.ObjectReplicationPolicy"]:
+        """List the object replication policies associated with the storage account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :return: An iterator like instance of either ObjectReplicationPolicy or the result of
+         cls(response)
+        :rtype:
+         ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.storage.v2024_01_01.models.ObjectReplicationPolicy]
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.ObjectReplicationPolicies] = kwargs.pop("cls", None)
+
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        def prepare_request(next_link=None):
+            if not next_link:
+
+                _request = build_list_request(
+                    resource_group_name=resource_group_name,
+                    account_name=account_name,
+                    subscription_id=self._config.subscription_id,
+                    api_version=api_version,
+                    headers=_headers,
+                    params=_params,
+                )
+                _request.url = self._client.format_url(_request.url)
+
+            else:
+                # make call to next link with the client's api-version
+                _parsed_next_link = urllib.parse.urlparse(next_link)
+                _next_request_params = case_insensitive_dict(
+                    {
+                        key: [urllib.parse.quote(v) for v in value]
+                        for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items()
+                    }
+                )
+                _next_request_params["api-version"] = self._api_version
+                _request = HttpRequest(
+                    "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
+                )
+                _request.url = self._client.format_url(_request.url)
+                _request.method = "GET"
+            return _request
+
+        async def extract_data(pipeline_response):
+            deserialized = self._deserialize("ObjectReplicationPolicies", pipeline_response)
+            list_of_elem = deserialized.value
+            if cls:
+                list_of_elem = cls(list_of_elem)  # type: ignore
+            return None, AsyncList(list_of_elem)
+
+        async def get_next(next_link=None):
+            _request = prepare_request(next_link)
+
+            _stream = False
+            pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+                _request, stream=_stream, **kwargs
+            )
+            response = pipeline_response.http_response
+
+            if response.status_code not in [200]:
+                map_error(status_code=response.status_code, response=response, error_map=error_map)
+                error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
+                raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
+
+            return pipeline_response
+
+        return AsyncItemPaged(get_next, extract_data)
+
+    @distributed_trace_async
+    async def get(
+        self, resource_group_name: str, account_name: str, object_replication_policy_id: str, **kwargs: Any
+    ) -> _models.ObjectReplicationPolicy:
+        """Get the object replication policy of the storage account by policy ID.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param object_replication_policy_id: For the destination account, provide the value 'default'.
+         Configure the policy on the destination account first. For the source account, provide the
+         value of the policy ID that is returned when you download the policy that was defined on the
+         destination account. The policy is downloaded as a JSON file. Required.
+        :type object_replication_policy_id: str
+        :return: ObjectReplicationPolicy or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.ObjectReplicationPolicy
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.ObjectReplicationPolicy] = kwargs.pop("cls", None)
+
+        _request = build_get_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            object_replication_policy_id=object_replication_policy_id,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
+            raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @overload
+    async def create_or_update(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        object_replication_policy_id: str,
+        properties: _models.ObjectReplicationPolicy,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.ObjectReplicationPolicy:
+        """Create or update the object replication policy of the storage account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param object_replication_policy_id: For the destination account, provide the value 'default'.
+         Configure the policy on the destination account first. For the source account, provide the
+         value of the policy ID that is returned when you download the policy that was defined on the
+         destination account. The policy is downloaded as a JSON file. Required.
+        :type object_replication_policy_id: str
+        :param properties: The object replication policy set to a storage account. A unique policy ID
+         will be created if absent. Required.
+        :type properties: ~azure.mgmt.storage.v2024_01_01.models.ObjectReplicationPolicy
+        :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: ObjectReplicationPolicy or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.ObjectReplicationPolicy
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @overload
+    async def create_or_update(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        object_replication_policy_id: str,
+        properties: IO[bytes],
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.ObjectReplicationPolicy:
+        """Create or update the object replication policy of the storage account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param object_replication_policy_id: For the destination account, provide the value 'default'.
+         Configure the policy on the destination account first. For the source account, provide the
+         value of the policy ID that is returned when you download the policy that was defined on the
+         destination account. The policy is downloaded as a JSON file. Required.
+        :type object_replication_policy_id: str
+        :param properties: The object replication policy set to a storage account. A unique policy ID
+         will be created if absent. Required.
+        :type properties: IO[bytes]
+        :keyword content_type: Body Parameter content-type. Content type parameter for binary body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: ObjectReplicationPolicy or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.ObjectReplicationPolicy
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @distributed_trace_async
+    async def create_or_update(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        object_replication_policy_id: str,
+        properties: Union[_models.ObjectReplicationPolicy, IO[bytes]],
+        **kwargs: Any
+    ) -> _models.ObjectReplicationPolicy:
+        """Create or update the object replication policy of the storage account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param object_replication_policy_id: For the destination account, provide the value 'default'.
+         Configure the policy on the destination account first. For the source account, provide the
+         value of the policy ID that is returned when you download the policy that was defined on the
+         destination account. The policy is downloaded as a JSON file. Required.
+        :type object_replication_policy_id: str
+        :param properties: The object replication policy set to a storage account. A unique policy ID
+         will be created if absent. Is either a ObjectReplicationPolicy type or a IO[bytes] type.
+         Required.
+        :type properties: ~azure.mgmt.storage.v2024_01_01.models.ObjectReplicationPolicy or IO[bytes]
+        :return: ObjectReplicationPolicy or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.ObjectReplicationPolicy
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _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", self._api_version or "2024-01-01"))
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+        cls: ClsType[_models.ObjectReplicationPolicy] = kwargs.pop("cls", None)
+
+        content_type = content_type or "application/json"
+        _json = None
+        _content = None
+        if isinstance(properties, (IOBase, bytes)):
+            _content = properties
+        else:
+            _json = self._serialize.body(properties, "ObjectReplicationPolicy")
+
+        _request = build_create_or_update_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            object_replication_policy_id=object_replication_policy_id,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            content_type=content_type,
+            json=_json,
+            content=_content,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
+            raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @distributed_trace_async
+    async def delete(
+        self, resource_group_name: str, account_name: str, object_replication_policy_id: str, **kwargs: Any
+    ) -> None:
+        """Deletes the object replication policy associated with the specified storage account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param object_replication_policy_id: For the destination account, provide the value 'default'.
+         Configure the policy on the destination account first. For the source account, provide the
+         value of the policy ID that is returned when you download the policy that was defined on the
+         destination account. The policy is downloaded as a JSON file. Required.
+        :type object_replication_policy_id: str
+        :return: None or the result of cls(response)
+        :rtype: None
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[None] = kwargs.pop("cls", None)
+
+        _request = build_delete_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            object_replication_policy_id=object_replication_policy_id,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200, 204]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
+            raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
+
+        if cls:
+            return cls(pipeline_response, None, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/operations/_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/operations/_operations.py
new file mode 100644
index 000000000000..85b9c5531bbe
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/operations/_operations.py
@@ -0,0 +1,130 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+import sys
+from typing import Any, AsyncIterable, Callable, Dict, Optional, TypeVar
+import urllib.parse
+
+from azure.core.async_paging import AsyncItemPaged, AsyncList
+from azure.core.exceptions import (
+    ClientAuthenticationError,
+    HttpResponseError,
+    ResourceExistsError,
+    ResourceNotFoundError,
+    ResourceNotModifiedError,
+    map_error,
+)
+from azure.core.pipeline import PipelineResponse
+from azure.core.rest import AsyncHttpResponse, HttpRequest
+from azure.core.tracing.decorator import distributed_trace
+from azure.core.utils import case_insensitive_dict
+from azure.mgmt.core.exceptions import ARMErrorFormat
+
+from ... import models as _models
+from ...operations._operations import build_list_request
+
+if sys.version_info >= (3, 9):
+    from collections.abc import MutableMapping
+else:
+    from typing import MutableMapping  # type: ignore
+T = TypeVar("T")
+ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
+
+
+class Operations:
+    """
+    .. warning::
+        **DO NOT** instantiate this class directly.
+
+        Instead, you should access the following operations through
+        :class:`~azure.mgmt.storage.v2024_01_01.aio.StorageManagementClient`'s
+        :attr:`operations` attribute.
+    """
+
+    models = _models
+
+    def __init__(self, *args, **kwargs) -> None:
+        input_args = list(args)
+        self._client = input_args.pop(0) if input_args else kwargs.pop("client")
+        self._config = input_args.pop(0) if input_args else kwargs.pop("config")
+        self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer")
+        self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer")
+        self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version")
+
+    @distributed_trace
+    def list(self, **kwargs: Any) -> AsyncIterable["_models.Operation"]:
+        """Lists all of the available Storage Rest API operations.
+
+        :return: An iterator like instance of either Operation or the result of cls(response)
+        :rtype:
+         ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.storage.v2024_01_01.models.Operation]
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None)
+
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        def prepare_request(next_link=None):
+            if not next_link:
+
+                _request = build_list_request(
+                    api_version=api_version,
+                    headers=_headers,
+                    params=_params,
+                )
+                _request.url = self._client.format_url(_request.url)
+
+            else:
+                # make call to next link with the client's api-version
+                _parsed_next_link = urllib.parse.urlparse(next_link)
+                _next_request_params = case_insensitive_dict(
+                    {
+                        key: [urllib.parse.quote(v) for v in value]
+                        for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items()
+                    }
+                )
+                _next_request_params["api-version"] = self._api_version
+                _request = HttpRequest(
+                    "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
+                )
+                _request.url = self._client.format_url(_request.url)
+                _request.method = "GET"
+            return _request
+
+        async def extract_data(pipeline_response):
+            deserialized = self._deserialize("OperationListResult", pipeline_response)
+            list_of_elem = deserialized.value
+            if cls:
+                list_of_elem = cls(list_of_elem)  # type: ignore
+            return None, AsyncList(list_of_elem)
+
+        async def get_next(next_link=None):
+            _request = prepare_request(next_link)
+
+            _stream = False
+            pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+                _request, stream=_stream, **kwargs
+            )
+            response = pipeline_response.http_response
+
+            if response.status_code not in [200]:
+                map_error(status_code=response.status_code, response=response, error_map=error_map)
+                raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+            return pipeline_response
+
+        return AsyncItemPaged(get_next, extract_data)
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/operations/_patch.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/operations/_patch.py
new file mode 100644
index 000000000000..f7dd32510333
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/operations/_patch.py
@@ -0,0 +1,20 @@
+# ------------------------------------
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+# ------------------------------------
+"""Customize generated code here.
+
+Follow our quickstart for examples: https://aka.ms/azsdk/python/dpcodegen/python/customize
+"""
+from typing import List
+
+__all__: List[str] = []  # Add all objects you want publicly available to users at this package level
+
+
+def patch_sdk():
+    """Do not remove from this file.
+
+    `patch_sdk` is a last resort escape hatch that allows you to do customizations
+    you can't accomplish using the techniques described in
+    https://aka.ms/azsdk/python/dpcodegen/python/customize
+    """
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/operations/_private_endpoint_connections_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/operations/_private_endpoint_connections_operations.py
new file mode 100644
index 000000000000..7e302e1d396c
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/operations/_private_endpoint_connections_operations.py
@@ -0,0 +1,424 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+from io import IOBase
+import sys
+from typing import Any, AsyncIterable, Callable, Dict, IO, Optional, TypeVar, Union, overload
+import urllib.parse
+
+from azure.core.async_paging import AsyncItemPaged, AsyncList
+from azure.core.exceptions import (
+    ClientAuthenticationError,
+    HttpResponseError,
+    ResourceExistsError,
+    ResourceNotFoundError,
+    ResourceNotModifiedError,
+    map_error,
+)
+from azure.core.pipeline import PipelineResponse
+from azure.core.rest import AsyncHttpResponse, HttpRequest
+from azure.core.tracing.decorator import distributed_trace
+from azure.core.tracing.decorator_async import distributed_trace_async
+from azure.core.utils import case_insensitive_dict
+from azure.mgmt.core.exceptions import ARMErrorFormat
+
+from ... import models as _models
+from ...operations._private_endpoint_connections_operations import (
+    build_delete_request,
+    build_get_request,
+    build_list_request,
+    build_put_request,
+)
+
+if sys.version_info >= (3, 9):
+    from collections.abc import MutableMapping
+else:
+    from typing import MutableMapping  # type: ignore
+T = TypeVar("T")
+ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
+
+
+class PrivateEndpointConnectionsOperations:
+    """
+    .. warning::
+        **DO NOT** instantiate this class directly.
+
+        Instead, you should access the following operations through
+        :class:`~azure.mgmt.storage.v2024_01_01.aio.StorageManagementClient`'s
+        :attr:`private_endpoint_connections` attribute.
+    """
+
+    models = _models
+
+    def __init__(self, *args, **kwargs) -> None:
+        input_args = list(args)
+        self._client = input_args.pop(0) if input_args else kwargs.pop("client")
+        self._config = input_args.pop(0) if input_args else kwargs.pop("config")
+        self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer")
+        self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer")
+        self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version")
+
+    @distributed_trace
+    def list(
+        self, resource_group_name: str, account_name: str, **kwargs: Any
+    ) -> AsyncIterable["_models.PrivateEndpointConnection"]:
+        """List all the private endpoint connections associated with the storage account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :return: An iterator like instance of either PrivateEndpointConnection or the result of
+         cls(response)
+        :rtype:
+         ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.storage.v2024_01_01.models.PrivateEndpointConnection]
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.PrivateEndpointConnectionListResult] = kwargs.pop("cls", None)
+
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        def prepare_request(next_link=None):
+            if not next_link:
+
+                _request = build_list_request(
+                    resource_group_name=resource_group_name,
+                    account_name=account_name,
+                    subscription_id=self._config.subscription_id,
+                    api_version=api_version,
+                    headers=_headers,
+                    params=_params,
+                )
+                _request.url = self._client.format_url(_request.url)
+
+            else:
+                # make call to next link with the client's api-version
+                _parsed_next_link = urllib.parse.urlparse(next_link)
+                _next_request_params = case_insensitive_dict(
+                    {
+                        key: [urllib.parse.quote(v) for v in value]
+                        for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items()
+                    }
+                )
+                _next_request_params["api-version"] = self._api_version
+                _request = HttpRequest(
+                    "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
+                )
+                _request.url = self._client.format_url(_request.url)
+                _request.method = "GET"
+            return _request
+
+        async def extract_data(pipeline_response):
+            deserialized = self._deserialize("PrivateEndpointConnectionListResult", pipeline_response)
+            list_of_elem = deserialized.value
+            if cls:
+                list_of_elem = cls(list_of_elem)  # type: ignore
+            return None, AsyncList(list_of_elem)
+
+        async def get_next(next_link=None):
+            _request = prepare_request(next_link)
+
+            _stream = False
+            pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+                _request, stream=_stream, **kwargs
+            )
+            response = pipeline_response.http_response
+
+            if response.status_code not in [200]:
+                map_error(status_code=response.status_code, response=response, error_map=error_map)
+                raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+            return pipeline_response
+
+        return AsyncItemPaged(get_next, extract_data)
+
+    @distributed_trace_async
+    async def get(
+        self, resource_group_name: str, account_name: str, private_endpoint_connection_name: str, **kwargs: Any
+    ) -> _models.PrivateEndpointConnection:
+        """Gets the specified private endpoint connection associated with the storage account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param private_endpoint_connection_name: The name of the private endpoint connection associated
+         with the Azure resource. Required.
+        :type private_endpoint_connection_name: str
+        :return: PrivateEndpointConnection or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.PrivateEndpointConnection
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.PrivateEndpointConnection] = kwargs.pop("cls", None)
+
+        _request = build_get_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            private_endpoint_connection_name=private_endpoint_connection_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
+            raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @overload
+    async def put(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        private_endpoint_connection_name: str,
+        properties: _models.PrivateEndpointConnection,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.PrivateEndpointConnection:
+        """Update the state of specified private endpoint connection associated with the storage account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param private_endpoint_connection_name: The name of the private endpoint connection associated
+         with the Azure resource. Required.
+        :type private_endpoint_connection_name: str
+        :param properties: The private endpoint connection properties. Required.
+        :type properties: ~azure.mgmt.storage.v2024_01_01.models.PrivateEndpointConnection
+        :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: PrivateEndpointConnection or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.PrivateEndpointConnection
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @overload
+    async def put(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        private_endpoint_connection_name: str,
+        properties: IO[bytes],
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.PrivateEndpointConnection:
+        """Update the state of specified private endpoint connection associated with the storage account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param private_endpoint_connection_name: The name of the private endpoint connection associated
+         with the Azure resource. Required.
+        :type private_endpoint_connection_name: str
+        :param properties: The private endpoint connection properties. Required.
+        :type properties: IO[bytes]
+        :keyword content_type: Body Parameter content-type. Content type parameter for binary body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: PrivateEndpointConnection or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.PrivateEndpointConnection
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @distributed_trace_async
+    async def put(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        private_endpoint_connection_name: str,
+        properties: Union[_models.PrivateEndpointConnection, IO[bytes]],
+        **kwargs: Any
+    ) -> _models.PrivateEndpointConnection:
+        """Update the state of specified private endpoint connection associated with the storage account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param private_endpoint_connection_name: The name of the private endpoint connection associated
+         with the Azure resource. Required.
+        :type private_endpoint_connection_name: str
+        :param properties: The private endpoint connection properties. Is either a
+         PrivateEndpointConnection type or a IO[bytes] type. Required.
+        :type properties: ~azure.mgmt.storage.v2024_01_01.models.PrivateEndpointConnection or IO[bytes]
+        :return: PrivateEndpointConnection or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.PrivateEndpointConnection
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _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", self._api_version or "2024-01-01"))
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+        cls: ClsType[_models.PrivateEndpointConnection] = kwargs.pop("cls", None)
+
+        content_type = content_type or "application/json"
+        _json = None
+        _content = None
+        if isinstance(properties, (IOBase, bytes)):
+            _content = properties
+        else:
+            _json = self._serialize.body(properties, "PrivateEndpointConnection")
+
+        _request = build_put_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            private_endpoint_connection_name=private_endpoint_connection_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            content_type=content_type,
+            json=_json,
+            content=_content,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
+            raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @distributed_trace_async
+    async def delete(
+        self, resource_group_name: str, account_name: str, private_endpoint_connection_name: str, **kwargs: Any
+    ) -> None:
+        """Deletes the specified private endpoint connection associated with the storage account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param private_endpoint_connection_name: The name of the private endpoint connection associated
+         with the Azure resource. Required.
+        :type private_endpoint_connection_name: str
+        :return: None or the result of cls(response)
+        :rtype: None
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[None] = kwargs.pop("cls", None)
+
+        _request = build_delete_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            private_endpoint_connection_name=private_endpoint_connection_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200, 204]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
+            raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
+
+        if cls:
+            return cls(pipeline_response, None, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/operations/_private_link_resources_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/operations/_private_link_resources_operations.py
new file mode 100644
index 000000000000..2eaa2b007aca
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/operations/_private_link_resources_operations.py
@@ -0,0 +1,113 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+import sys
+from typing import Any, Callable, Dict, Optional, TypeVar
+
+from azure.core.exceptions import (
+    ClientAuthenticationError,
+    HttpResponseError,
+    ResourceExistsError,
+    ResourceNotFoundError,
+    ResourceNotModifiedError,
+    map_error,
+)
+from azure.core.pipeline import PipelineResponse
+from azure.core.rest import AsyncHttpResponse, HttpRequest
+from azure.core.tracing.decorator_async import distributed_trace_async
+from azure.core.utils import case_insensitive_dict
+from azure.mgmt.core.exceptions import ARMErrorFormat
+
+from ... import models as _models
+from ...operations._private_link_resources_operations import build_list_by_storage_account_request
+
+if sys.version_info >= (3, 9):
+    from collections.abc import MutableMapping
+else:
+    from typing import MutableMapping  # type: ignore
+T = TypeVar("T")
+ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
+
+
+class PrivateLinkResourcesOperations:
+    """
+    .. warning::
+        **DO NOT** instantiate this class directly.
+
+        Instead, you should access the following operations through
+        :class:`~azure.mgmt.storage.v2024_01_01.aio.StorageManagementClient`'s
+        :attr:`private_link_resources` attribute.
+    """
+
+    models = _models
+
+    def __init__(self, *args, **kwargs) -> None:
+        input_args = list(args)
+        self._client = input_args.pop(0) if input_args else kwargs.pop("client")
+        self._config = input_args.pop(0) if input_args else kwargs.pop("config")
+        self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer")
+        self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer")
+        self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version")
+
+    @distributed_trace_async
+    async def list_by_storage_account(
+        self, resource_group_name: str, account_name: str, **kwargs: Any
+    ) -> _models.PrivateLinkResourceListResult:
+        """Gets the private link resources that need to be created for a storage account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :return: PrivateLinkResourceListResult or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.PrivateLinkResourceListResult
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.PrivateLinkResourceListResult] = kwargs.pop("cls", None)
+
+        _request = build_list_by_storage_account_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("PrivateLinkResourceListResult", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/operations/_queue_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/operations/_queue_operations.py
new file mode 100644
index 000000000000..499059b60851
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/operations/_queue_operations.py
@@ -0,0 +1,597 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+from io import IOBase
+import sys
+from typing import Any, AsyncIterable, Callable, Dict, IO, Optional, TypeVar, Union, overload
+import urllib.parse
+
+from azure.core.async_paging import AsyncItemPaged, AsyncList
+from azure.core.exceptions import (
+    ClientAuthenticationError,
+    HttpResponseError,
+    ResourceExistsError,
+    ResourceNotFoundError,
+    ResourceNotModifiedError,
+    map_error,
+)
+from azure.core.pipeline import PipelineResponse
+from azure.core.rest import AsyncHttpResponse, HttpRequest
+from azure.core.tracing.decorator import distributed_trace
+from azure.core.tracing.decorator_async import distributed_trace_async
+from azure.core.utils import case_insensitive_dict
+from azure.mgmt.core.exceptions import ARMErrorFormat
+
+from ... import models as _models
+from ...operations._queue_operations import (
+    build_create_request,
+    build_delete_request,
+    build_get_request,
+    build_list_request,
+    build_update_request,
+)
+
+if sys.version_info >= (3, 9):
+    from collections.abc import MutableMapping
+else:
+    from typing import MutableMapping  # type: ignore
+T = TypeVar("T")
+ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
+
+
+class QueueOperations:
+    """
+    .. warning::
+        **DO NOT** instantiate this class directly.
+
+        Instead, you should access the following operations through
+        :class:`~azure.mgmt.storage.v2024_01_01.aio.StorageManagementClient`'s
+        :attr:`queue` attribute.
+    """
+
+    models = _models
+
+    def __init__(self, *args, **kwargs) -> None:
+        input_args = list(args)
+        self._client = input_args.pop(0) if input_args else kwargs.pop("client")
+        self._config = input_args.pop(0) if input_args else kwargs.pop("config")
+        self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer")
+        self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer")
+        self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version")
+
+    @overload
+    async def create(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        queue_name: str,
+        queue: _models.StorageQueue,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.StorageQueue:
+        """Creates a new queue with the specified queue name, under the specified account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param queue_name: A queue name must be unique within a storage account and must be between 3
+         and 63 characters.The name must comprise of lowercase alphanumeric and dash(-) characters only,
+         it should begin and end with an alphanumeric character and it cannot have two consecutive
+         dash(-) characters. Required.
+        :type queue_name: str
+        :param queue: Queue properties and metadata to be created with. Required.
+        :type queue: ~azure.mgmt.storage.v2024_01_01.models.StorageQueue
+        :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: StorageQueue or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.StorageQueue
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @overload
+    async def create(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        queue_name: str,
+        queue: IO[bytes],
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.StorageQueue:
+        """Creates a new queue with the specified queue name, under the specified account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param queue_name: A queue name must be unique within a storage account and must be between 3
+         and 63 characters.The name must comprise of lowercase alphanumeric and dash(-) characters only,
+         it should begin and end with an alphanumeric character and it cannot have two consecutive
+         dash(-) characters. Required.
+        :type queue_name: str
+        :param queue: Queue properties and metadata to be created with. Required.
+        :type queue: IO[bytes]
+        :keyword content_type: Body Parameter content-type. Content type parameter for binary body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: StorageQueue or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.StorageQueue
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @distributed_trace_async
+    async def create(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        queue_name: str,
+        queue: Union[_models.StorageQueue, IO[bytes]],
+        **kwargs: Any
+    ) -> _models.StorageQueue:
+        """Creates a new queue with the specified queue name, under the specified account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param queue_name: A queue name must be unique within a storage account and must be between 3
+         and 63 characters.The name must comprise of lowercase alphanumeric and dash(-) characters only,
+         it should begin and end with an alphanumeric character and it cannot have two consecutive
+         dash(-) characters. Required.
+        :type queue_name: str
+        :param queue: Queue properties and metadata to be created with. Is either a StorageQueue type
+         or a IO[bytes] type. Required.
+        :type queue: ~azure.mgmt.storage.v2024_01_01.models.StorageQueue or IO[bytes]
+        :return: StorageQueue or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.StorageQueue
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _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", self._api_version or "2024-01-01"))
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+        cls: ClsType[_models.StorageQueue] = kwargs.pop("cls", None)
+
+        content_type = content_type or "application/json"
+        _json = None
+        _content = None
+        if isinstance(queue, (IOBase, bytes)):
+            _content = queue
+        else:
+            _json = self._serialize.body(queue, "StorageQueue")
+
+        _request = build_create_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            queue_name=queue_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            content_type=content_type,
+            json=_json,
+            content=_content,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("StorageQueue", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @overload
+    async def update(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        queue_name: str,
+        queue: _models.StorageQueue,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.StorageQueue:
+        """Creates a new queue with the specified queue name, under the specified account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param queue_name: A queue name must be unique within a storage account and must be between 3
+         and 63 characters.The name must comprise of lowercase alphanumeric and dash(-) characters only,
+         it should begin and end with an alphanumeric character and it cannot have two consecutive
+         dash(-) characters. Required.
+        :type queue_name: str
+        :param queue: Queue properties and metadata to be created with. Required.
+        :type queue: ~azure.mgmt.storage.v2024_01_01.models.StorageQueue
+        :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: StorageQueue or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.StorageQueue
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @overload
+    async def update(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        queue_name: str,
+        queue: IO[bytes],
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.StorageQueue:
+        """Creates a new queue with the specified queue name, under the specified account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param queue_name: A queue name must be unique within a storage account and must be between 3
+         and 63 characters.The name must comprise of lowercase alphanumeric and dash(-) characters only,
+         it should begin and end with an alphanumeric character and it cannot have two consecutive
+         dash(-) characters. Required.
+        :type queue_name: str
+        :param queue: Queue properties and metadata to be created with. Required.
+        :type queue: IO[bytes]
+        :keyword content_type: Body Parameter content-type. Content type parameter for binary body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: StorageQueue or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.StorageQueue
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @distributed_trace_async
+    async def update(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        queue_name: str,
+        queue: Union[_models.StorageQueue, IO[bytes]],
+        **kwargs: Any
+    ) -> _models.StorageQueue:
+        """Creates a new queue with the specified queue name, under the specified account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param queue_name: A queue name must be unique within a storage account and must be between 3
+         and 63 characters.The name must comprise of lowercase alphanumeric and dash(-) characters only,
+         it should begin and end with an alphanumeric character and it cannot have two consecutive
+         dash(-) characters. Required.
+        :type queue_name: str
+        :param queue: Queue properties and metadata to be created with. Is either a StorageQueue type
+         or a IO[bytes] type. Required.
+        :type queue: ~azure.mgmt.storage.v2024_01_01.models.StorageQueue or IO[bytes]
+        :return: StorageQueue or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.StorageQueue
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _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", self._api_version or "2024-01-01"))
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+        cls: ClsType[_models.StorageQueue] = kwargs.pop("cls", None)
+
+        content_type = content_type or "application/json"
+        _json = None
+        _content = None
+        if isinstance(queue, (IOBase, bytes)):
+            _content = queue
+        else:
+            _json = self._serialize.body(queue, "StorageQueue")
+
+        _request = build_update_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            queue_name=queue_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            content_type=content_type,
+            json=_json,
+            content=_content,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("StorageQueue", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @distributed_trace_async
+    async def get(
+        self, resource_group_name: str, account_name: str, queue_name: str, **kwargs: Any
+    ) -> _models.StorageQueue:
+        """Gets the queue with the specified queue name, under the specified account if it exists.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param queue_name: A queue name must be unique within a storage account and must be between 3
+         and 63 characters.The name must comprise of lowercase alphanumeric and dash(-) characters only,
+         it should begin and end with an alphanumeric character and it cannot have two consecutive
+         dash(-) characters. Required.
+        :type queue_name: str
+        :return: StorageQueue or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.StorageQueue
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.StorageQueue] = kwargs.pop("cls", None)
+
+        _request = build_get_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            queue_name=queue_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("StorageQueue", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @distributed_trace_async
+    async def delete(self, resource_group_name: str, account_name: str, queue_name: str, **kwargs: Any) -> None:
+        """Deletes the queue with the specified queue name, under the specified account if it exists.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param queue_name: A queue name must be unique within a storage account and must be between 3
+         and 63 characters.The name must comprise of lowercase alphanumeric and dash(-) characters only,
+         it should begin and end with an alphanumeric character and it cannot have two consecutive
+         dash(-) characters. Required.
+        :type queue_name: str
+        :return: None or the result of cls(response)
+        :rtype: None
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[None] = kwargs.pop("cls", None)
+
+        _request = build_delete_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            queue_name=queue_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [204]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        if cls:
+            return cls(pipeline_response, None, {})  # type: ignore
+
+    @distributed_trace
+    def list(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        maxpagesize: Optional[str] = None,
+        filter: Optional[str] = None,
+        **kwargs: Any
+    ) -> AsyncIterable["_models.ListQueue"]:
+        """Gets a list of all the queues under the specified storage account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param maxpagesize: Optional, a maximum number of queues that should be included in a list
+         queue response. Default value is None.
+        :type maxpagesize: str
+        :param filter: Optional, When specified, only the queues with a name starting with the given
+         filter will be listed. Default value is None.
+        :type filter: str
+        :return: An iterator like instance of either ListQueue or the result of cls(response)
+        :rtype:
+         ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.storage.v2024_01_01.models.ListQueue]
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.ListQueueResource] = kwargs.pop("cls", None)
+
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        def prepare_request(next_link=None):
+            if not next_link:
+
+                _request = build_list_request(
+                    resource_group_name=resource_group_name,
+                    account_name=account_name,
+                    subscription_id=self._config.subscription_id,
+                    maxpagesize=maxpagesize,
+                    filter=filter,
+                    api_version=api_version,
+                    headers=_headers,
+                    params=_params,
+                )
+                _request.url = self._client.format_url(_request.url)
+
+            else:
+                # make call to next link with the client's api-version
+                _parsed_next_link = urllib.parse.urlparse(next_link)
+                _next_request_params = case_insensitive_dict(
+                    {
+                        key: [urllib.parse.quote(v) for v in value]
+                        for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items()
+                    }
+                )
+                _next_request_params["api-version"] = self._api_version
+                _request = HttpRequest(
+                    "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
+                )
+                _request.url = self._client.format_url(_request.url)
+                _request.method = "GET"
+            return _request
+
+        async def extract_data(pipeline_response):
+            deserialized = self._deserialize("ListQueueResource", pipeline_response)
+            list_of_elem = deserialized.value
+            if cls:
+                list_of_elem = cls(list_of_elem)  # type: ignore
+            return deserialized.next_link or None, AsyncList(list_of_elem)
+
+        async def get_next(next_link=None):
+            _request = prepare_request(next_link)
+
+            _stream = False
+            pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+                _request, stream=_stream, **kwargs
+            )
+            response = pipeline_response.http_response
+
+            if response.status_code not in [200]:
+                map_error(status_code=response.status_code, response=response, error_map=error_map)
+                raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+            return pipeline_response
+
+        return AsyncItemPaged(get_next, extract_data)
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/operations/_queue_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/operations/_queue_services_operations.py
new file mode 100644
index 000000000000..b83601300a4e
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/operations/_queue_services_operations.py
@@ -0,0 +1,322 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+from io import IOBase
+import sys
+from typing import Any, Callable, Dict, IO, Literal, Optional, TypeVar, Union, overload
+
+from azure.core.exceptions import (
+    ClientAuthenticationError,
+    HttpResponseError,
+    ResourceExistsError,
+    ResourceNotFoundError,
+    ResourceNotModifiedError,
+    map_error,
+)
+from azure.core.pipeline import PipelineResponse
+from azure.core.rest import AsyncHttpResponse, HttpRequest
+from azure.core.tracing.decorator_async import distributed_trace_async
+from azure.core.utils import case_insensitive_dict
+from azure.mgmt.core.exceptions import ARMErrorFormat
+
+from ... import models as _models
+from ...operations._queue_services_operations import (
+    build_get_service_properties_request,
+    build_list_request,
+    build_set_service_properties_request,
+)
+
+if sys.version_info >= (3, 9):
+    from collections.abc import MutableMapping
+else:
+    from typing import MutableMapping  # type: ignore
+T = TypeVar("T")
+ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
+
+
+class QueueServicesOperations:
+    """
+    .. warning::
+        **DO NOT** instantiate this class directly.
+
+        Instead, you should access the following operations through
+        :class:`~azure.mgmt.storage.v2024_01_01.aio.StorageManagementClient`'s
+        :attr:`queue_services` attribute.
+    """
+
+    models = _models
+
+    def __init__(self, *args, **kwargs) -> None:
+        input_args = list(args)
+        self._client = input_args.pop(0) if input_args else kwargs.pop("client")
+        self._config = input_args.pop(0) if input_args else kwargs.pop("config")
+        self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer")
+        self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer")
+        self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version")
+
+    @distributed_trace_async
+    async def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _models.ListQueueServices:
+        """List all queue services for the storage account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :return: ListQueueServices or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.ListQueueServices
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.ListQueueServices] = kwargs.pop("cls", None)
+
+        _request = build_list_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("ListQueueServices", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @overload
+    async def set_service_properties(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        parameters: _models.QueueServiceProperties,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.QueueServiceProperties:
+        """Sets the properties of a storage account’s Queue service, including properties for Storage
+        Analytics and CORS (Cross-Origin Resource Sharing) rules.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param parameters: The properties of a storage account’s Queue service, only properties for
+         Storage Analytics and CORS (Cross-Origin Resource Sharing) rules can be specified. Required.
+        :type parameters: ~azure.mgmt.storage.v2024_01_01.models.QueueServiceProperties
+        :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: QueueServiceProperties or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.QueueServiceProperties
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @overload
+    async def set_service_properties(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        parameters: IO[bytes],
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.QueueServiceProperties:
+        """Sets the properties of a storage account’s Queue service, including properties for Storage
+        Analytics and CORS (Cross-Origin Resource Sharing) rules.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param parameters: The properties of a storage account’s Queue service, only properties for
+         Storage Analytics and CORS (Cross-Origin Resource Sharing) rules can be specified. Required.
+        :type parameters: IO[bytes]
+        :keyword content_type: Body Parameter content-type. Content type parameter for binary body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: QueueServiceProperties or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.QueueServiceProperties
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @distributed_trace_async
+    async def set_service_properties(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        parameters: Union[_models.QueueServiceProperties, IO[bytes]],
+        **kwargs: Any
+    ) -> _models.QueueServiceProperties:
+        """Sets the properties of a storage account’s Queue service, including properties for Storage
+        Analytics and CORS (Cross-Origin Resource Sharing) rules.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param parameters: The properties of a storage account’s Queue service, only properties for
+         Storage Analytics and CORS (Cross-Origin Resource Sharing) rules can be specified. Is either a
+         QueueServiceProperties type or a IO[bytes] type. Required.
+        :type parameters: ~azure.mgmt.storage.v2024_01_01.models.QueueServiceProperties or IO[bytes]
+        :return: QueueServiceProperties or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.QueueServiceProperties
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _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", self._api_version or "2024-01-01"))
+        queue_service_name: Literal["default"] = kwargs.pop("queue_service_name", "default")
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+        cls: ClsType[_models.QueueServiceProperties] = kwargs.pop("cls", None)
+
+        content_type = content_type or "application/json"
+        _json = None
+        _content = None
+        if isinstance(parameters, (IOBase, bytes)):
+            _content = parameters
+        else:
+            _json = self._serialize.body(parameters, "QueueServiceProperties")
+
+        _request = build_set_service_properties_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            queue_service_name=queue_service_name,
+            content_type=content_type,
+            json=_json,
+            content=_content,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("QueueServiceProperties", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @distributed_trace_async
+    async def get_service_properties(
+        self, resource_group_name: str, account_name: str, **kwargs: Any
+    ) -> _models.QueueServiceProperties:
+        """Gets the properties of a storage account’s Queue service, including properties for Storage
+        Analytics and CORS (Cross-Origin Resource Sharing) rules.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :return: QueueServiceProperties or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.QueueServiceProperties
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        queue_service_name: Literal["default"] = kwargs.pop("queue_service_name", "default")
+        cls: ClsType[_models.QueueServiceProperties] = kwargs.pop("cls", None)
+
+        _request = build_get_service_properties_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            queue_service_name=queue_service_name,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("QueueServiceProperties", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/operations/_skus_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/operations/_skus_operations.py
new file mode 100644
index 000000000000..d31978257e3d
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/operations/_skus_operations.py
@@ -0,0 +1,131 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+import sys
+from typing import Any, AsyncIterable, Callable, Dict, Optional, TypeVar
+import urllib.parse
+
+from azure.core.async_paging import AsyncItemPaged, AsyncList
+from azure.core.exceptions import (
+    ClientAuthenticationError,
+    HttpResponseError,
+    ResourceExistsError,
+    ResourceNotFoundError,
+    ResourceNotModifiedError,
+    map_error,
+)
+from azure.core.pipeline import PipelineResponse
+from azure.core.rest import AsyncHttpResponse, HttpRequest
+from azure.core.tracing.decorator import distributed_trace
+from azure.core.utils import case_insensitive_dict
+from azure.mgmt.core.exceptions import ARMErrorFormat
+
+from ... import models as _models
+from ...operations._skus_operations import build_list_request
+
+if sys.version_info >= (3, 9):
+    from collections.abc import MutableMapping
+else:
+    from typing import MutableMapping  # type: ignore
+T = TypeVar("T")
+ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
+
+
+class SkusOperations:
+    """
+    .. warning::
+        **DO NOT** instantiate this class directly.
+
+        Instead, you should access the following operations through
+        :class:`~azure.mgmt.storage.v2024_01_01.aio.StorageManagementClient`'s
+        :attr:`skus` attribute.
+    """
+
+    models = _models
+
+    def __init__(self, *args, **kwargs) -> None:
+        input_args = list(args)
+        self._client = input_args.pop(0) if input_args else kwargs.pop("client")
+        self._config = input_args.pop(0) if input_args else kwargs.pop("config")
+        self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer")
+        self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer")
+        self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version")
+
+    @distributed_trace
+    def list(self, **kwargs: Any) -> AsyncIterable["_models.SkuInformation"]:
+        """Lists the available SKUs supported by Microsoft.Storage for given subscription.
+
+        :return: An iterator like instance of either SkuInformation or the result of cls(response)
+        :rtype:
+         ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.storage.v2024_01_01.models.SkuInformation]
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.StorageSkuListResult] = kwargs.pop("cls", None)
+
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        def prepare_request(next_link=None):
+            if not next_link:
+
+                _request = build_list_request(
+                    subscription_id=self._config.subscription_id,
+                    api_version=api_version,
+                    headers=_headers,
+                    params=_params,
+                )
+                _request.url = self._client.format_url(_request.url)
+
+            else:
+                # make call to next link with the client's api-version
+                _parsed_next_link = urllib.parse.urlparse(next_link)
+                _next_request_params = case_insensitive_dict(
+                    {
+                        key: [urllib.parse.quote(v) for v in value]
+                        for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items()
+                    }
+                )
+                _next_request_params["api-version"] = self._api_version
+                _request = HttpRequest(
+                    "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
+                )
+                _request.url = self._client.format_url(_request.url)
+                _request.method = "GET"
+            return _request
+
+        async def extract_data(pipeline_response):
+            deserialized = self._deserialize("StorageSkuListResult", pipeline_response)
+            list_of_elem = deserialized.value
+            if cls:
+                list_of_elem = cls(list_of_elem)  # type: ignore
+            return None, AsyncList(list_of_elem)
+
+        async def get_next(next_link=None):
+            _request = prepare_request(next_link)
+
+            _stream = False
+            pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+                _request, stream=_stream, **kwargs
+            )
+            response = pipeline_response.http_response
+
+            if response.status_code not in [200]:
+                map_error(status_code=response.status_code, response=response, error_map=error_map)
+                raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+            return pipeline_response
+
+        return AsyncItemPaged(get_next, extract_data)
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/operations/_storage_accounts_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/operations/_storage_accounts_operations.py
new file mode 100644
index 000000000000..a51f5cfba65d
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/operations/_storage_accounts_operations.py
@@ -0,0 +1,2222 @@
+# 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.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+from io import IOBase
+import sys
+from typing import (
+    Any,
+    AsyncIterable,
+    AsyncIterator,
+    Callable,
+    Dict,
+    IO,
+    Literal,
+    Optional,
+    TypeVar,
+    Union,
+    cast,
+    overload,
+)
+import urllib.parse
+
+from azure.core.async_paging import AsyncItemPaged, AsyncList
+from azure.core.exceptions import (
+    ClientAuthenticationError,
+    HttpResponseError,
+    ResourceExistsError,
+    ResourceNotFoundError,
+    ResourceNotModifiedError,
+    StreamClosedError,
+    StreamConsumedError,
+    map_error,
+)
+from azure.core.pipeline import PipelineResponse
+from azure.core.polling import AsyncLROPoller, AsyncNoPolling, AsyncPollingMethod
+from azure.core.rest import AsyncHttpResponse, HttpRequest
+from azure.core.tracing.decorator import distributed_trace
+from azure.core.tracing.decorator_async import distributed_trace_async
+from azure.core.utils import case_insensitive_dict
+from azure.mgmt.core.exceptions import ARMErrorFormat
+from azure.mgmt.core.polling.async_arm_polling import AsyncARMPolling
+
+from ... import models as _models
+from ...operations._storage_accounts_operations import (
+    build_abort_hierarchical_namespace_migration_request,
+    build_check_name_availability_request,
+    build_create_request,
+    build_customer_initiated_migration_request,
+    build_delete_request,
+    build_failover_request,
+    build_get_customer_initiated_migration_request,
+    build_get_properties_request,
+    build_hierarchical_namespace_migration_request,
+    build_list_account_sas_request,
+    build_list_by_resource_group_request,
+    build_list_keys_request,
+    build_list_request,
+    build_list_service_sas_request,
+    build_regenerate_key_request,
+    build_restore_blob_ranges_request,
+    build_revoke_user_delegation_keys_request,
+    build_update_request,
+)
+
+if sys.version_info >= (3, 9):
+    from collections.abc import MutableMapping
+else:
+    from typing import MutableMapping  # type: ignore
+T = TypeVar("T")
+ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
+
+
+class StorageAccountsOperations:  # pylint: disable=too-many-public-methods
+    """
+    .. warning::
+        **DO NOT** instantiate this class directly.
+
+        Instead, you should access the following operations through
+        :class:`~azure.mgmt.storage.v2024_01_01.aio.StorageManagementClient`'s
+        :attr:`storage_accounts` attribute.
+    """
+
+    models = _models
+
+    def __init__(self, *args, **kwargs) -> None:
+        input_args = list(args)
+        self._client = input_args.pop(0) if input_args else kwargs.pop("client")
+        self._config = input_args.pop(0) if input_args else kwargs.pop("config")
+        self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer")
+        self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer")
+        self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version")
+
+    @overload
+    async def check_name_availability(
+        self,
+        account_name: _models.StorageAccountCheckNameAvailabilityParameters,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.CheckNameAvailabilityResult:
+        """Checks that the storage account name is valid and is not already in use.
+
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name:
+         ~azure.mgmt.storage.v2024_01_01.models.StorageAccountCheckNameAvailabilityParameters
+        :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: CheckNameAvailabilityResult or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.CheckNameAvailabilityResult
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @overload
+    async def check_name_availability(
+        self, account_name: IO[bytes], *, content_type: str = "application/json", **kwargs: Any
+    ) -> _models.CheckNameAvailabilityResult:
+        """Checks that the storage account name is valid and is not already in use.
+
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: IO[bytes]
+        :keyword content_type: Body Parameter content-type. Content type parameter for binary body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: CheckNameAvailabilityResult or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.CheckNameAvailabilityResult
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @distributed_trace_async
+    async def check_name_availability(
+        self, account_name: Union[_models.StorageAccountCheckNameAvailabilityParameters, IO[bytes]], **kwargs: Any
+    ) -> _models.CheckNameAvailabilityResult:
+        """Checks that the storage account name is valid and is not already in use.
+
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Is either a StorageAccountCheckNameAvailabilityParameters type or a
+         IO[bytes] type. Required.
+        :type account_name:
+         ~azure.mgmt.storage.v2024_01_01.models.StorageAccountCheckNameAvailabilityParameters or
+         IO[bytes]
+        :return: CheckNameAvailabilityResult or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.CheckNameAvailabilityResult
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _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", self._api_version or "2024-01-01"))
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+        cls: ClsType[_models.CheckNameAvailabilityResult] = kwargs.pop("cls", None)
+
+        content_type = content_type or "application/json"
+        _json = None
+        _content = None
+        if isinstance(account_name, (IOBase, bytes)):
+            _content = account_name
+        else:
+            _json = self._serialize.body(account_name, "StorageAccountCheckNameAvailabilityParameters")
+
+        _request = build_check_name_availability_request(
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            content_type=content_type,
+            json=_json,
+            content=_content,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    async def _create_initial(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        parameters: Union[_models.StorageAccountCreateParameters, IO[bytes]],
+        **kwargs: Any
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _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", self._api_version or "2024-01-01"))
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
+
+        content_type = content_type or "application/json"
+        _json = None
+        _content = None
+        if isinstance(parameters, (IOBase, bytes)):
+            _content = parameters
+        else:
+            _json = self._serialize.body(parameters, "StorageAccountCreateParameters")
+
+        _request = build_create_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            content_type=content_type,
+            json=_json,
+            content=_content,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
+        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200, 202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @overload
+    async def begin_create(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        parameters: _models.StorageAccountCreateParameters,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> AsyncLROPoller[_models.StorageAccount]:
+        """Asynchronously creates a new storage account with the specified parameters. If an account is
+        already created and a subsequent create request is issued with different properties, the
+        account properties will be updated. If an account is already created and a subsequent create or
+        update request is issued with the exact same set of properties, the request will succeed.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param parameters: The parameters to provide for the created account. Required.
+        :type parameters: ~azure.mgmt.storage.v2024_01_01.models.StorageAccountCreateParameters
+        :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: An instance of AsyncLROPoller that returns either StorageAccount or the result of
+         cls(response)
+        :rtype:
+         ~azure.core.polling.AsyncLROPoller[~azure.mgmt.storage.v2024_01_01.models.StorageAccount]
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @overload
+    async def begin_create(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        parameters: IO[bytes],
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> AsyncLROPoller[_models.StorageAccount]:
+        """Asynchronously creates a new storage account with the specified parameters. If an account is
+        already created and a subsequent create request is issued with different properties, the
+        account properties will be updated. If an account is already created and a subsequent create or
+        update request is issued with the exact same set of properties, the request will succeed.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param parameters: The parameters to provide for the created account. Required.
+        :type parameters: IO[bytes]
+        :keyword content_type: Body Parameter content-type. Content type parameter for binary body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: An instance of AsyncLROPoller that returns either StorageAccount or the result of
+         cls(response)
+        :rtype:
+         ~azure.core.polling.AsyncLROPoller[~azure.mgmt.storage.v2024_01_01.models.StorageAccount]
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @distributed_trace_async
+    async def begin_create(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        parameters: Union[_models.StorageAccountCreateParameters, IO[bytes]],
+        **kwargs: Any
+    ) -> AsyncLROPoller[_models.StorageAccount]:
+        """Asynchronously creates a new storage account with the specified parameters. If an account is
+        already created and a subsequent create request is issued with different properties, the
+        account properties will be updated. If an account is already created and a subsequent create or
+        update request is issued with the exact same set of properties, the request will succeed.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param parameters: The parameters to provide for the created account. Is either a
+         StorageAccountCreateParameters type or a IO[bytes] type. Required.
+        :type parameters: ~azure.mgmt.storage.v2024_01_01.models.StorageAccountCreateParameters or
+         IO[bytes]
+        :return: An instance of AsyncLROPoller that returns either StorageAccount or the result of
+         cls(response)
+        :rtype:
+         ~azure.core.polling.AsyncLROPoller[~azure.mgmt.storage.v2024_01_01.models.StorageAccount]
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        _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", self._api_version or "2024-01-01"))
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+        cls: ClsType[_models.StorageAccount] = kwargs.pop("cls", None)
+        polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True)
+        lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
+        cont_token: Optional[str] = kwargs.pop("continuation_token", None)
+        if cont_token is None:
+            raw_result = await self._create_initial(
+                resource_group_name=resource_group_name,
+                account_name=account_name,
+                parameters=parameters,
+                api_version=api_version,
+                content_type=content_type,
+                cls=lambda x, y, z: x,
+                headers=_headers,
+                params=_params,
+                **kwargs
+            )
+            await raw_result.http_response.read()  # type: ignore
+        kwargs.pop("error_map", None)
+
+        def get_long_running_output(pipeline_response):
+            deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
+            if cls:
+                return cls(pipeline_response, deserialized, {})  # type: ignore
+            return deserialized
+
+        if polling is True:
+            polling_method: AsyncPollingMethod = cast(AsyncPollingMethod, AsyncARMPolling(lro_delay, **kwargs))
+        elif polling is False:
+            polling_method = cast(AsyncPollingMethod, AsyncNoPolling())
+        else:
+            polling_method = polling
+        if cont_token:
+            return AsyncLROPoller[_models.StorageAccount].from_continuation_token(
+                polling_method=polling_method,
+                continuation_token=cont_token,
+                client=self._client,
+                deserialization_callback=get_long_running_output,
+            )
+        return AsyncLROPoller[_models.StorageAccount](
+            self._client, raw_result, get_long_running_output, polling_method  # type: ignore
+        )
+
+    @distributed_trace_async
+    async def delete(self, resource_group_name: str, account_name: str, **kwargs: Any) -> None:
+        """Deletes a storage account in Microsoft Azure.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :return: None or the result of cls(response)
+        :rtype: None
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[None] = kwargs.pop("cls", None)
+
+        _request = build_delete_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200, 204]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        if cls:
+            return cls(pipeline_response, None, {})  # type: ignore
+
+    @distributed_trace_async
+    async def get_properties(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        expand: Optional[Union[str, _models.StorageAccountExpand]] = None,
+        **kwargs: Any
+    ) -> _models.StorageAccount:
+        """Returns the properties for the specified storage account including but not limited to name, SKU
+        name, location, and account status. The ListKeys operation should be used to retrieve storage
+        keys.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param expand: May be used to expand the properties within account's properties. By default,
+         data is not included when fetching properties. Currently we only support geoReplicationStats
+         and blobRestoreStatus. Known values are: "geoReplicationStats" and "blobRestoreStatus". Default
+         value is None.
+        :type expand: str or ~azure.mgmt.storage.v2024_01_01.models.StorageAccountExpand
+        :return: StorageAccount or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.StorageAccount
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.StorageAccount] = kwargs.pop("cls", None)
+
+        _request = build_get_properties_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            subscription_id=self._config.subscription_id,
+            expand=expand,
+            api_version=api_version,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @overload
+    async def update(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        parameters: _models.StorageAccountUpdateParameters,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.StorageAccount:
+        """The update operation can be used to update the SKU, encryption, access tier, or tags for a
+        storage account. It can also be used to map the account to a custom domain. Only one custom
+        domain is supported per storage account; the replacement/change of custom domain is not
+        supported. In order to replace an old custom domain, the old value must be cleared/unregistered
+        before a new value can be set. The update of multiple properties is supported. This call does
+        not change the storage keys for the account. If you want to change the storage account keys,
+        use the regenerate keys operation. The location and name of the storage account cannot be
+        changed after creation.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param parameters: The parameters to provide for the updated account. Required.
+        :type parameters: ~azure.mgmt.storage.v2024_01_01.models.StorageAccountUpdateParameters
+        :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: StorageAccount or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.StorageAccount
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @overload
+    async def update(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        parameters: IO[bytes],
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.StorageAccount:
+        """The update operation can be used to update the SKU, encryption, access tier, or tags for a
+        storage account. It can also be used to map the account to a custom domain. Only one custom
+        domain is supported per storage account; the replacement/change of custom domain is not
+        supported. In order to replace an old custom domain, the old value must be cleared/unregistered
+        before a new value can be set. The update of multiple properties is supported. This call does
+        not change the storage keys for the account. If you want to change the storage account keys,
+        use the regenerate keys operation. The location and name of the storage account cannot be
+        changed after creation.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param parameters: The parameters to provide for the updated account. Required.
+        :type parameters: IO[bytes]
+        :keyword content_type: Body Parameter content-type. Content type parameter for binary body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: StorageAccount or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.StorageAccount
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @distributed_trace_async
+    async def update(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        parameters: Union[_models.StorageAccountUpdateParameters, IO[bytes]],
+        **kwargs: Any
+    ) -> _models.StorageAccount:
+        """The update operation can be used to update the SKU, encryption, access tier, or tags for a
+        storage account. It can also be used to map the account to a custom domain. Only one custom
+        domain is supported per storage account; the replacement/change of custom domain is not
+        supported. In order to replace an old custom domain, the old value must be cleared/unregistered
+        before a new value can be set. The update of multiple properties is supported. This call does
+        not change the storage keys for the account. If you want to change the storage account keys,
+        use the regenerate keys operation. The location and name of the storage account cannot be
+        changed after creation.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param parameters: The parameters to provide for the updated account. Is either a
+         StorageAccountUpdateParameters type or a IO[bytes] type. Required.
+        :type parameters: ~azure.mgmt.storage.v2024_01_01.models.StorageAccountUpdateParameters or
+         IO[bytes]
+        :return: StorageAccount or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.StorageAccount
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _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", self._api_version or "2024-01-01"))
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+        cls: ClsType[_models.StorageAccount] = kwargs.pop("cls", None)
+
+        content_type = content_type or "application/json"
+        _json = None
+        _content = None
+        if isinstance(parameters, (IOBase, bytes)):
+            _content = parameters
+        else:
+            _json = self._serialize.body(parameters, "StorageAccountUpdateParameters")
+
+        _request = build_update_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            content_type=content_type,
+            json=_json,
+            content=_content,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @distributed_trace
+    def list(self, **kwargs: Any) -> AsyncIterable["_models.StorageAccount"]:
+        """Lists all the storage accounts available under the subscription. Note that storage keys are not
+        returned; use the ListKeys operation for this.
+
+        :return: An iterator like instance of either StorageAccount or the result of cls(response)
+        :rtype:
+         ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.storage.v2024_01_01.models.StorageAccount]
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
+
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        def prepare_request(next_link=None):
+            if not next_link:
+
+                _request = build_list_request(
+                    subscription_id=self._config.subscription_id,
+                    api_version=api_version,
+                    headers=_headers,
+                    params=_params,
+                )
+                _request.url = self._client.format_url(_request.url)
+
+            else:
+                # make call to next link with the client's api-version
+                _parsed_next_link = urllib.parse.urlparse(next_link)
+                _next_request_params = case_insensitive_dict(
+                    {
+                        key: [urllib.parse.quote(v) for v in value]
+                        for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items()
+                    }
+                )
+                _next_request_params["api-version"] = self._api_version
+                _request = HttpRequest(
+                    "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
+                )
+                _request.url = self._client.format_url(_request.url)
+                _request.method = "GET"
+            return _request
+
+        async def extract_data(pipeline_response):
+            deserialized = self._deserialize("StorageAccountListResult", pipeline_response)
+            list_of_elem = deserialized.value
+            if cls:
+                list_of_elem = cls(list_of_elem)  # type: ignore
+            return deserialized.next_link or None, AsyncList(list_of_elem)
+
+        async def get_next(next_link=None):
+            _request = prepare_request(next_link)
+
+            _stream = False
+            pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+                _request, stream=_stream, **kwargs
+            )
+            response = pipeline_response.http_response
+
+            if response.status_code not in [200]:
+                map_error(status_code=response.status_code, response=response, error_map=error_map)
+                raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+            return pipeline_response
+
+        return AsyncItemPaged(get_next, extract_data)
+
+    @distributed_trace
+    def list_by_resource_group(
+        self, resource_group_name: str, **kwargs: Any
+    ) -> AsyncIterable["_models.StorageAccount"]:
+        """Lists all the storage accounts available under the given resource group. Note that storage keys
+        are not returned; use the ListKeys operation for this.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :return: An iterator like instance of either StorageAccount or the result of cls(response)
+        :rtype:
+         ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.storage.v2024_01_01.models.StorageAccount]
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
+
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        def prepare_request(next_link=None):
+            if not next_link:
+
+                _request = build_list_by_resource_group_request(
+                    resource_group_name=resource_group_name,
+                    subscription_id=self._config.subscription_id,
+                    api_version=api_version,
+                    headers=_headers,
+                    params=_params,
+                )
+                _request.url = self._client.format_url(_request.url)
+
+            else:
+                # make call to next link with the client's api-version
+                _parsed_next_link = urllib.parse.urlparse(next_link)
+                _next_request_params = case_insensitive_dict(
+                    {
+                        key: [urllib.parse.quote(v) for v in value]
+                        for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items()
+                    }
+                )
+                _next_request_params["api-version"] = self._api_version
+                _request = HttpRequest(
+                    "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
+                )
+                _request.url = self._client.format_url(_request.url)
+                _request.method = "GET"
+            return _request
+
+        async def extract_data(pipeline_response):
+            deserialized = self._deserialize("StorageAccountListResult", pipeline_response)
+            list_of_elem = deserialized.value
+            if cls:
+                list_of_elem = cls(list_of_elem)  # type: ignore
+            return deserialized.next_link or None, AsyncList(list_of_elem)
+
+        async def get_next(next_link=None):
+            _request = prepare_request(next_link)
+
+            _stream = False
+            pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+                _request, stream=_stream, **kwargs
+            )
+            response = pipeline_response.http_response
+
+            if response.status_code not in [200]:
+                map_error(status_code=response.status_code, response=response, error_map=error_map)
+                raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+            return pipeline_response
+
+        return AsyncItemPaged(get_next, extract_data)
+
+    @distributed_trace_async
+    async def list_keys(
+        self, resource_group_name: str, account_name: str, expand: Literal["kerb"] = "kerb", **kwargs: Any
+    ) -> _models.StorageAccountListKeysResult:
+        """Lists the access keys or Kerberos keys (if active directory enabled) for the specified storage
+        account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param expand: Specifies type of the key to be listed. Possible value is kerb. Known values are
+         "kerb" and None. Default value is "kerb".
+        :type expand: str
+        :return: StorageAccountListKeysResult or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.StorageAccountListKeysResult
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.StorageAccountListKeysResult] = kwargs.pop("cls", None)
+
+        _request = build_list_keys_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            subscription_id=self._config.subscription_id,
+            expand=expand,
+            api_version=api_version,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @overload
+    async def regenerate_key(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        regenerate_key: _models.StorageAccountRegenerateKeyParameters,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.StorageAccountListKeysResult:
+        """Regenerates one of the access keys or Kerberos keys for the specified storage account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param regenerate_key: Specifies name of the key which should be regenerated -- key1, key2,
+         kerb1, kerb2. Required.
+        :type regenerate_key:
+         ~azure.mgmt.storage.v2024_01_01.models.StorageAccountRegenerateKeyParameters
+        :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: StorageAccountListKeysResult or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.StorageAccountListKeysResult
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @overload
+    async def regenerate_key(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        regenerate_key: IO[bytes],
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.StorageAccountListKeysResult:
+        """Regenerates one of the access keys or Kerberos keys for the specified storage account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param regenerate_key: Specifies name of the key which should be regenerated -- key1, key2,
+         kerb1, kerb2. Required.
+        :type regenerate_key: IO[bytes]
+        :keyword content_type: Body Parameter content-type. Content type parameter for binary body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: StorageAccountListKeysResult or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.StorageAccountListKeysResult
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @distributed_trace_async
+    async def regenerate_key(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        regenerate_key: Union[_models.StorageAccountRegenerateKeyParameters, IO[bytes]],
+        **kwargs: Any
+    ) -> _models.StorageAccountListKeysResult:
+        """Regenerates one of the access keys or Kerberos keys for the specified storage account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param regenerate_key: Specifies name of the key which should be regenerated -- key1, key2,
+         kerb1, kerb2. Is either a StorageAccountRegenerateKeyParameters type or a IO[bytes] type.
+         Required.
+        :type regenerate_key:
+         ~azure.mgmt.storage.v2024_01_01.models.StorageAccountRegenerateKeyParameters or IO[bytes]
+        :return: StorageAccountListKeysResult or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.StorageAccountListKeysResult
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _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", self._api_version or "2024-01-01"))
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+        cls: ClsType[_models.StorageAccountListKeysResult] = kwargs.pop("cls", None)
+
+        content_type = content_type or "application/json"
+        _json = None
+        _content = None
+        if isinstance(regenerate_key, (IOBase, bytes)):
+            _content = regenerate_key
+        else:
+            _json = self._serialize.body(regenerate_key, "StorageAccountRegenerateKeyParameters")
+
+        _request = build_regenerate_key_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            content_type=content_type,
+            json=_json,
+            content=_content,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @overload
+    async def list_account_sas(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        parameters: _models.AccountSasParameters,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.ListAccountSasResponse:
+        """List SAS credentials of a storage account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param parameters: The parameters to provide to list SAS credentials for the storage account.
+         Required.
+        :type parameters: ~azure.mgmt.storage.v2024_01_01.models.AccountSasParameters
+        :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: ListAccountSasResponse or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.ListAccountSasResponse
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @overload
+    async def list_account_sas(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        parameters: IO[bytes],
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.ListAccountSasResponse:
+        """List SAS credentials of a storage account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param parameters: The parameters to provide to list SAS credentials for the storage account.
+         Required.
+        :type parameters: IO[bytes]
+        :keyword content_type: Body Parameter content-type. Content type parameter for binary body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: ListAccountSasResponse or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.ListAccountSasResponse
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @distributed_trace_async
+    async def list_account_sas(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        parameters: Union[_models.AccountSasParameters, IO[bytes]],
+        **kwargs: Any
+    ) -> _models.ListAccountSasResponse:
+        """List SAS credentials of a storage account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param parameters: The parameters to provide to list SAS credentials for the storage account.
+         Is either a AccountSasParameters type or a IO[bytes] type. Required.
+        :type parameters: ~azure.mgmt.storage.v2024_01_01.models.AccountSasParameters or IO[bytes]
+        :return: ListAccountSasResponse or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.ListAccountSasResponse
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _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", self._api_version or "2024-01-01"))
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+        cls: ClsType[_models.ListAccountSasResponse] = kwargs.pop("cls", None)
+
+        content_type = content_type or "application/json"
+        _json = None
+        _content = None
+        if isinstance(parameters, (IOBase, bytes)):
+            _content = parameters
+        else:
+            _json = self._serialize.body(parameters, "AccountSasParameters")
+
+        _request = build_list_account_sas_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            content_type=content_type,
+            json=_json,
+            content=_content,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("ListAccountSasResponse", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @overload
+    async def list_service_sas(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        parameters: _models.ServiceSasParameters,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.ListServiceSasResponse:
+        """List service SAS credentials of a specific resource.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param parameters: The parameters to provide to list service SAS credentials. Required.
+        :type parameters: ~azure.mgmt.storage.v2024_01_01.models.ServiceSasParameters
+        :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: ListServiceSasResponse or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.ListServiceSasResponse
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @overload
+    async def list_service_sas(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        parameters: IO[bytes],
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.ListServiceSasResponse:
+        """List service SAS credentials of a specific resource.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param parameters: The parameters to provide to list service SAS credentials. Required.
+        :type parameters: IO[bytes]
+        :keyword content_type: Body Parameter content-type. Content type parameter for binary body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: ListServiceSasResponse or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.ListServiceSasResponse
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @distributed_trace_async
+    async def list_service_sas(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        parameters: Union[_models.ServiceSasParameters, IO[bytes]],
+        **kwargs: Any
+    ) -> _models.ListServiceSasResponse:
+        """List service SAS credentials of a specific resource.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param parameters: The parameters to provide to list service SAS credentials. Is either a
+         ServiceSasParameters type or a IO[bytes] type. Required.
+        :type parameters: ~azure.mgmt.storage.v2024_01_01.models.ServiceSasParameters or IO[bytes]
+        :return: ListServiceSasResponse or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.ListServiceSasResponse
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _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", self._api_version or "2024-01-01"))
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+        cls: ClsType[_models.ListServiceSasResponse] = kwargs.pop("cls", None)
+
+        content_type = content_type or "application/json"
+        _json = None
+        _content = None
+        if isinstance(parameters, (IOBase, bytes)):
+            _content = parameters
+        else:
+            _json = self._serialize.body(parameters, "ServiceSasParameters")
+
+        _request = build_list_service_sas_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            content_type=content_type,
+            json=_json,
+            content=_content,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("ListServiceSasResponse", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    async def _failover_initial(
+        self, resource_group_name: str, account_name: str, failover_type: Literal["Planned"] = "Planned", **kwargs: Any
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
+
+        _request = build_failover_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            subscription_id=self._config.subscription_id,
+            failover_type=failover_type,
+            api_version=api_version,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
+        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200, 202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @distributed_trace_async
+    async def begin_failover(
+        self, resource_group_name: str, account_name: str, failover_type: Literal["Planned"] = "Planned", **kwargs: Any
+    ) -> AsyncLROPoller[None]:
+        """A failover request can be triggered for a storage account in the event a primary endpoint
+        becomes unavailable for any reason. The failover occurs from the storage account's primary
+        cluster to the secondary cluster for RA-GRS accounts. The secondary cluster will become primary
+        after failover and the account is converted to LRS. In the case of a Planned Failover, the
+        primary and secondary clusters are swapped after failover and the account remains
+        geo-replicated. Failover should continue to be used in the event of availability issues as
+        Planned failover is only available while the primary and secondary endpoints are available. The
+        primary use case of a Planned Failover is disaster recovery testing drills. This type of
+        failover is invoked by setting FailoverType parameter to 'Planned'. Learn more about the
+        failover options here-
+        https://learn.microsoft.com/en-us/azure/storage/common/storage-disaster-recovery-guidance.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param failover_type: The parameter is set to 'Planned' to indicate whether a Planned failover
+         is requested. Known values are "Planned" and None. Default value is "Planned".
+        :type failover_type: str
+        :return: An instance of AsyncLROPoller that returns either None or the result of cls(response)
+        :rtype: ~azure.core.polling.AsyncLROPoller[None]
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[None] = kwargs.pop("cls", None)
+        polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True)
+        lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
+        cont_token: Optional[str] = kwargs.pop("continuation_token", None)
+        if cont_token is None:
+            raw_result = await self._failover_initial(
+                resource_group_name=resource_group_name,
+                account_name=account_name,
+                failover_type=failover_type,
+                api_version=api_version,
+                cls=lambda x, y, z: x,
+                headers=_headers,
+                params=_params,
+                **kwargs
+            )
+            await raw_result.http_response.read()  # type: ignore
+        kwargs.pop("error_map", None)
+
+        def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
+            if cls:
+                return cls(pipeline_response, None, {})  # type: ignore
+
+        if polling is True:
+            polling_method: AsyncPollingMethod = cast(
+                AsyncPollingMethod, AsyncARMPolling(lro_delay, lro_options={"final-state-via": "location"}, **kwargs)
+            )
+        elif polling is False:
+            polling_method = cast(AsyncPollingMethod, AsyncNoPolling())
+        else:
+            polling_method = polling
+        if cont_token:
+            return AsyncLROPoller[None].from_continuation_token(
+                polling_method=polling_method,
+                continuation_token=cont_token,
+                client=self._client,
+                deserialization_callback=get_long_running_output,
+            )
+        return AsyncLROPoller[None](self._client, raw_result, get_long_running_output, polling_method)  # type: ignore
+
+    async def _hierarchical_namespace_migration_initial(  # pylint: disable=name-too-long
+        self, resource_group_name: str, account_name: str, request_type: str, **kwargs: Any
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
+
+        _request = build_hierarchical_namespace_migration_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            subscription_id=self._config.subscription_id,
+            request_type=request_type,
+            api_version=api_version,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
+        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200, 202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
+            raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
+
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @distributed_trace_async
+    async def begin_hierarchical_namespace_migration(
+        self, resource_group_name: str, account_name: str, request_type: str, **kwargs: Any
+    ) -> AsyncLROPoller[None]:
+        """Live Migration of storage account to enable Hns.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param request_type: Required. Hierarchical namespace migration type can either be a
+         hierarchical namespace validation request 'HnsOnValidationRequest' or a hydration request
+         'HnsOnHydrationRequest'. The validation request will validate the migration whereas the
+         hydration request will migrate the account. Required.
+        :type request_type: str
+        :return: An instance of AsyncLROPoller that returns either None or the result of cls(response)
+        :rtype: ~azure.core.polling.AsyncLROPoller[None]
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[None] = kwargs.pop("cls", None)
+        polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True)
+        lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
+        cont_token: Optional[str] = kwargs.pop("continuation_token", None)
+        if cont_token is None:
+            raw_result = await self._hierarchical_namespace_migration_initial(
+                resource_group_name=resource_group_name,
+                account_name=account_name,
+                request_type=request_type,
+                api_version=api_version,
+                cls=lambda x, y, z: x,
+                headers=_headers,
+                params=_params,
+                **kwargs
+            )
+            await raw_result.http_response.read()  # type: ignore
+        kwargs.pop("error_map", None)
+
+        def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
+            if cls:
+                return cls(pipeline_response, None, {})  # type: ignore
+
+        if polling is True:
+            polling_method: AsyncPollingMethod = cast(
+                AsyncPollingMethod, AsyncARMPolling(lro_delay, lro_options={"final-state-via": "location"}, **kwargs)
+            )
+        elif polling is False:
+            polling_method = cast(AsyncPollingMethod, AsyncNoPolling())
+        else:
+            polling_method = polling
+        if cont_token:
+            return AsyncLROPoller[None].from_continuation_token(
+                polling_method=polling_method,
+                continuation_token=cont_token,
+                client=self._client,
+                deserialization_callback=get_long_running_output,
+            )
+        return AsyncLROPoller[None](self._client, raw_result, get_long_running_output, polling_method)  # type: ignore
+
+    async def _abort_hierarchical_namespace_migration_initial(  # pylint: disable=name-too-long
+        self, resource_group_name: str, account_name: str, **kwargs: Any
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
+
+        _request = build_abort_hierarchical_namespace_migration_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
+        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200, 202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
+            raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
+
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @distributed_trace_async
+    async def begin_abort_hierarchical_namespace_migration(  # pylint: disable=name-too-long
+        self, resource_group_name: str, account_name: str, **kwargs: Any
+    ) -> AsyncLROPoller[None]:
+        """Abort live Migration of storage account to enable Hns.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :return: An instance of AsyncLROPoller that returns either None or the result of cls(response)
+        :rtype: ~azure.core.polling.AsyncLROPoller[None]
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[None] = kwargs.pop("cls", None)
+        polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True)
+        lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
+        cont_token: Optional[str] = kwargs.pop("continuation_token", None)
+        if cont_token is None:
+            raw_result = await self._abort_hierarchical_namespace_migration_initial(
+                resource_group_name=resource_group_name,
+                account_name=account_name,
+                api_version=api_version,
+                cls=lambda x, y, z: x,
+                headers=_headers,
+                params=_params,
+                **kwargs
+            )
+            await raw_result.http_response.read()  # type: ignore
+        kwargs.pop("error_map", None)
+
+        def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
+            if cls:
+                return cls(pipeline_response, None, {})  # type: ignore
+
+        if polling is True:
+            polling_method: AsyncPollingMethod = cast(
+                AsyncPollingMethod, AsyncARMPolling(lro_delay, lro_options={"final-state-via": "location"}, **kwargs)
+            )
+        elif polling is False:
+            polling_method = cast(AsyncPollingMethod, AsyncNoPolling())
+        else:
+            polling_method = polling
+        if cont_token:
+            return AsyncLROPoller[None].from_continuation_token(
+                polling_method=polling_method,
+                continuation_token=cont_token,
+                client=self._client,
+                deserialization_callback=get_long_running_output,
+            )
+        return AsyncLROPoller[None](self._client, raw_result, get_long_running_output, polling_method)  # type: ignore
+
+    async def _customer_initiated_migration_initial(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        parameters: Union[_models.StorageAccountMigration, IO[bytes]],
+        **kwargs: Any
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _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", self._api_version or "2024-01-01"))
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
+
+        content_type = content_type or "application/json"
+        _json = None
+        _content = None
+        if isinstance(parameters, (IOBase, bytes)):
+            _content = parameters
+        else:
+            _json = self._serialize.body(parameters, "StorageAccountMigration")
+
+        _request = build_customer_initiated_migration_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            content_type=content_type,
+            json=_json,
+            content=_content,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
+        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200, 202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            error = self._deserialize.failsafe_deserialize(_models.ErrorResponseAutoGenerated, pipeline_response)
+            raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
+
+        response_headers = {}
+        if response.status_code == 202:
+            response_headers["Location"] = self._deserialize("str", response.headers.get("Location"))
+
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
+        if cls:
+            return cls(pipeline_response, deserialized, response_headers)  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @overload
+    async def begin_customer_initiated_migration(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        parameters: _models.StorageAccountMigration,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> AsyncLROPoller[None]:
+        """Account Migration request can be triggered for a storage account to change its redundancy
+        level. The migration updates the non-zonal redundant storage account to a zonal redundant
+        account or vice-versa in order to have better reliability and availability. Zone-redundant
+        storage (ZRS) replicates your storage account synchronously across three Azure availability
+        zones in the primary region.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param parameters: The request parameters required to perform storage account migration.
+         Required.
+        :type parameters: ~azure.mgmt.storage.v2024_01_01.models.StorageAccountMigration
+        :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: An instance of AsyncLROPoller that returns either None or the result of cls(response)
+        :rtype: ~azure.core.polling.AsyncLROPoller[None]
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @overload
+    async def begin_customer_initiated_migration(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        parameters: IO[bytes],
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> AsyncLROPoller[None]:
+        """Account Migration request can be triggered for a storage account to change its redundancy
+        level. The migration updates the non-zonal redundant storage account to a zonal redundant
+        account or vice-versa in order to have better reliability and availability. Zone-redundant
+        storage (ZRS) replicates your storage account synchronously across three Azure availability
+        zones in the primary region.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param parameters: The request parameters required to perform storage account migration.
+         Required.
+        :type parameters: IO[bytes]
+        :keyword content_type: Body Parameter content-type. Content type parameter for binary body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: An instance of AsyncLROPoller that returns either None or the result of cls(response)
+        :rtype: ~azure.core.polling.AsyncLROPoller[None]
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @distributed_trace_async
+    async def begin_customer_initiated_migration(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        parameters: Union[_models.StorageAccountMigration, IO[bytes]],
+        **kwargs: Any
+    ) -> AsyncLROPoller[None]:
+        """Account Migration request can be triggered for a storage account to change its redundancy
+        level. The migration updates the non-zonal redundant storage account to a zonal redundant
+        account or vice-versa in order to have better reliability and availability. Zone-redundant
+        storage (ZRS) replicates your storage account synchronously across three Azure availability
+        zones in the primary region.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param parameters: The request parameters required to perform storage account migration. Is
+         either a StorageAccountMigration type or a IO[bytes] type. Required.
+        :type parameters: ~azure.mgmt.storage.v2024_01_01.models.StorageAccountMigration or IO[bytes]
+        :return: An instance of AsyncLROPoller that returns either None or the result of cls(response)
+        :rtype: ~azure.core.polling.AsyncLROPoller[None]
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        _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", self._api_version or "2024-01-01"))
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+        cls: ClsType[None] = kwargs.pop("cls", None)
+        polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True)
+        lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
+        cont_token: Optional[str] = kwargs.pop("continuation_token", None)
+        if cont_token is None:
+            raw_result = await self._customer_initiated_migration_initial(
+                resource_group_name=resource_group_name,
+                account_name=account_name,
+                parameters=parameters,
+                api_version=api_version,
+                content_type=content_type,
+                cls=lambda x, y, z: x,
+                headers=_headers,
+                params=_params,
+                **kwargs
+            )
+            await raw_result.http_response.read()  # type: ignore
+        kwargs.pop("error_map", None)
+
+        def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
+            if cls:
+                return cls(pipeline_response, None, {})  # type: ignore
+
+        if polling is True:
+            polling_method: AsyncPollingMethod = cast(
+                AsyncPollingMethod, AsyncARMPolling(lro_delay, lro_options={"final-state-via": "location"}, **kwargs)
+            )
+        elif polling is False:
+            polling_method = cast(AsyncPollingMethod, AsyncNoPolling())
+        else:
+            polling_method = polling
+        if cont_token:
+            return AsyncLROPoller[None].from_continuation_token(
+                polling_method=polling_method,
+                continuation_token=cont_token,
+                client=self._client,
+                deserialization_callback=get_long_running_output,
+            )
+        return AsyncLROPoller[None](self._client, raw_result, get_long_running_output, polling_method)  # type: ignore
+
+    @distributed_trace_async
+    async def get_customer_initiated_migration(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        migration_name: Union[str, _models.MigrationName],
+        **kwargs: Any
+    ) -> _models.StorageAccountMigration:
+        """Gets the status of the ongoing migration for the specified storage account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param migration_name: The name of the Storage Account Migration. It should always be
+         'default'. "default" Required.
+        :type migration_name: str or ~azure.mgmt.storage.v2024_01_01.models.MigrationName
+        :return: StorageAccountMigration or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.StorageAccountMigration
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.StorageAccountMigration] = kwargs.pop("cls", None)
+
+        _request = build_get_customer_initiated_migration_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            migration_name=migration_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            error = self._deserialize.failsafe_deserialize(_models.ErrorResponseAutoGenerated, pipeline_response)
+            raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("StorageAccountMigration", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    async def _restore_blob_ranges_initial(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        parameters: Union[_models.BlobRestoreParameters, IO[bytes]],
+        **kwargs: Any
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _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", self._api_version or "2024-01-01"))
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
+
+        content_type = content_type or "application/json"
+        _json = None
+        _content = None
+        if isinstance(parameters, (IOBase, bytes)):
+            _content = parameters
+        else:
+            _json = self._serialize.body(parameters, "BlobRestoreParameters")
+
+        _request = build_restore_blob_ranges_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            content_type=content_type,
+            json=_json,
+            content=_content,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
+        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200, 202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @overload
+    async def begin_restore_blob_ranges(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        parameters: _models.BlobRestoreParameters,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> AsyncLROPoller[_models.BlobRestoreStatus]:
+        """Restore blobs in the specified blob ranges.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param parameters: The parameters to provide for restore blob ranges. Required.
+        :type parameters: ~azure.mgmt.storage.v2024_01_01.models.BlobRestoreParameters
+        :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: An instance of AsyncLROPoller that returns either BlobRestoreStatus or the result of
+         cls(response)
+        :rtype:
+         ~azure.core.polling.AsyncLROPoller[~azure.mgmt.storage.v2024_01_01.models.BlobRestoreStatus]
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @overload
+    async def begin_restore_blob_ranges(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        parameters: IO[bytes],
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> AsyncLROPoller[_models.BlobRestoreStatus]:
+        """Restore blobs in the specified blob ranges.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param parameters: The parameters to provide for restore blob ranges. Required.
+        :type parameters: IO[bytes]
+        :keyword content_type: Body Parameter content-type. Content type parameter for binary body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: An instance of AsyncLROPoller that returns either BlobRestoreStatus or the result of
+         cls(response)
+        :rtype:
+         ~azure.core.polling.AsyncLROPoller[~azure.mgmt.storage.v2024_01_01.models.BlobRestoreStatus]
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @distributed_trace_async
+    async def begin_restore_blob_ranges(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        parameters: Union[_models.BlobRestoreParameters, IO[bytes]],
+        **kwargs: Any
+    ) -> AsyncLROPoller[_models.BlobRestoreStatus]:
+        """Restore blobs in the specified blob ranges.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param parameters: The parameters to provide for restore blob ranges. Is either a
+         BlobRestoreParameters type or a IO[bytes] type. Required.
+        :type parameters: ~azure.mgmt.storage.v2024_01_01.models.BlobRestoreParameters or IO[bytes]
+        :return: An instance of AsyncLROPoller that returns either BlobRestoreStatus or the result of
+         cls(response)
+        :rtype:
+         ~azure.core.polling.AsyncLROPoller[~azure.mgmt.storage.v2024_01_01.models.BlobRestoreStatus]
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        _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", self._api_version or "2024-01-01"))
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+        cls: ClsType[_models.BlobRestoreStatus] = kwargs.pop("cls", None)
+        polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True)
+        lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
+        cont_token: Optional[str] = kwargs.pop("continuation_token", None)
+        if cont_token is None:
+            raw_result = await self._restore_blob_ranges_initial(
+                resource_group_name=resource_group_name,
+                account_name=account_name,
+                parameters=parameters,
+                api_version=api_version,
+                content_type=content_type,
+                cls=lambda x, y, z: x,
+                headers=_headers,
+                params=_params,
+                **kwargs
+            )
+            await raw_result.http_response.read()  # type: ignore
+        kwargs.pop("error_map", None)
+
+        def get_long_running_output(pipeline_response):
+            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response.http_response)
+            if cls:
+                return cls(pipeline_response, deserialized, {})  # type: ignore
+            return deserialized
+
+        if polling is True:
+            polling_method: AsyncPollingMethod = cast(
+                AsyncPollingMethod, AsyncARMPolling(lro_delay, lro_options={"final-state-via": "location"}, **kwargs)
+            )
+        elif polling is False:
+            polling_method = cast(AsyncPollingMethod, AsyncNoPolling())
+        else:
+            polling_method = polling
+        if cont_token:
+            return AsyncLROPoller[_models.BlobRestoreStatus].from_continuation_token(
+                polling_method=polling_method,
+                continuation_token=cont_token,
+                client=self._client,
+                deserialization_callback=get_long_running_output,
+            )
+        return AsyncLROPoller[_models.BlobRestoreStatus](
+            self._client, raw_result, get_long_running_output, polling_method  # type: ignore
+        )
+
+    @distributed_trace_async
+    async def revoke_user_delegation_keys(self, resource_group_name: str, account_name: str, **kwargs: Any) -> None:
+        """Revoke user delegation keys.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :return: None or the result of cls(response)
+        :rtype: None
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[None] = kwargs.pop("cls", None)
+
+        _request = build_revoke_user_delegation_keys_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        if cls:
+            return cls(pipeline_response, None, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/operations/_storage_task_assignment_instances_report_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/operations/_storage_task_assignment_instances_report_operations.py
new file mode 100644
index 000000000000..bb1fe0ab48c8
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/operations/_storage_task_assignment_instances_report_operations.py
@@ -0,0 +1,166 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+import sys
+from typing import Any, AsyncIterable, Callable, Dict, Optional, TypeVar
+import urllib.parse
+
+from azure.core.async_paging import AsyncItemPaged, AsyncList
+from azure.core.exceptions import (
+    ClientAuthenticationError,
+    HttpResponseError,
+    ResourceExistsError,
+    ResourceNotFoundError,
+    ResourceNotModifiedError,
+    map_error,
+)
+from azure.core.pipeline import PipelineResponse
+from azure.core.rest import AsyncHttpResponse, HttpRequest
+from azure.core.tracing.decorator import distributed_trace
+from azure.core.utils import case_insensitive_dict
+from azure.mgmt.core.exceptions import ARMErrorFormat
+
+from ... import models as _models
+from ...operations._storage_task_assignment_instances_report_operations import build_list_request
+
+if sys.version_info >= (3, 9):
+    from collections.abc import MutableMapping
+else:
+    from typing import MutableMapping  # type: ignore
+T = TypeVar("T")
+ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
+
+
+class StorageTaskAssignmentInstancesReportOperations:  # pylint: disable=name-too-long
+    """
+    .. warning::
+        **DO NOT** instantiate this class directly.
+
+        Instead, you should access the following operations through
+        :class:`~azure.mgmt.storage.v2024_01_01.aio.StorageManagementClient`'s
+        :attr:`storage_task_assignment_instances_report` attribute.
+    """
+
+    models = _models
+
+    def __init__(self, *args, **kwargs) -> None:
+        input_args = list(args)
+        self._client = input_args.pop(0) if input_args else kwargs.pop("client")
+        self._config = input_args.pop(0) if input_args else kwargs.pop("config")
+        self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer")
+        self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer")
+        self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version")
+
+    @distributed_trace
+    def list(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        storage_task_assignment_name: str,
+        maxpagesize: Optional[int] = None,
+        filter: Optional[str] = None,
+        **kwargs: Any
+    ) -> AsyncIterable["_models.StorageTaskReportInstance"]:
+        # pylint: disable=line-too-long
+        """Fetch the report summary of a single storage task assignment's instances.
+
+        :param resource_group_name: The name of the resource group. The name is case insensitive.
+         Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param storage_task_assignment_name: The name of the storage task assignment within the
+         specified resource group. Storage task assignment names must be between 3 and 24 characters in
+         length and use numbers and lower-case letters only. Required.
+        :type storage_task_assignment_name: str
+        :param maxpagesize: Optional, specifies the maximum number of storage task assignment instances
+         to be included in the list response. Default value is None.
+        :type maxpagesize: int
+        :param filter: Optional. When specified, it can be used to query using reporting properties.
+         See `Constructing Filter Strings
+         <https://learn.microsoft.com/en-us/rest/api/storageservices/querying-tables-and-entities#constructing-filter-strings>`_
+         for details. Default value is None.
+        :type filter: str
+        :return: An iterator like instance of either StorageTaskReportInstance or the result of
+         cls(response)
+        :rtype:
+         ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.storage.v2024_01_01.models.StorageTaskReportInstance]
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.StorageTaskReportSummary] = kwargs.pop("cls", None)
+
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        def prepare_request(next_link=None):
+            if not next_link:
+
+                _request = build_list_request(
+                    resource_group_name=resource_group_name,
+                    account_name=account_name,
+                    storage_task_assignment_name=storage_task_assignment_name,
+                    subscription_id=self._config.subscription_id,
+                    maxpagesize=maxpagesize,
+                    filter=filter,
+                    api_version=api_version,
+                    headers=_headers,
+                    params=_params,
+                )
+                _request.url = self._client.format_url(_request.url)
+
+            else:
+                # make call to next link with the client's api-version
+                _parsed_next_link = urllib.parse.urlparse(next_link)
+                _next_request_params = case_insensitive_dict(
+                    {
+                        key: [urllib.parse.quote(v) for v in value]
+                        for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items()
+                    }
+                )
+                _next_request_params["api-version"] = self._api_version
+                _request = HttpRequest(
+                    "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
+                )
+                _request.url = self._client.format_url(_request.url)
+                _request.method = "GET"
+            return _request
+
+        async def extract_data(pipeline_response):
+            deserialized = self._deserialize("StorageTaskReportSummary", pipeline_response)
+            list_of_elem = deserialized.value
+            if cls:
+                list_of_elem = cls(list_of_elem)  # type: ignore
+            return deserialized.next_link or None, AsyncList(list_of_elem)
+
+        async def get_next(next_link=None):
+            _request = prepare_request(next_link)
+
+            _stream = False
+            pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+                _request, stream=_stream, **kwargs
+            )
+            response = pipeline_response.http_response
+
+            if response.status_code not in [200]:
+                map_error(status_code=response.status_code, response=response, error_map=error_map)
+                error = self._deserialize.failsafe_deserialize(_models.ErrorResponseAutoGenerated, pipeline_response)
+                raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
+
+            return pipeline_response
+
+        return AsyncItemPaged(get_next, extract_data)
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/operations/_storage_task_assignments_instances_report_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/operations/_storage_task_assignments_instances_report_operations.py
new file mode 100644
index 000000000000..5c1f50376cbb
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/operations/_storage_task_assignments_instances_report_operations.py
@@ -0,0 +1,160 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+import sys
+from typing import Any, AsyncIterable, Callable, Dict, Optional, TypeVar
+import urllib.parse
+
+from azure.core.async_paging import AsyncItemPaged, AsyncList
+from azure.core.exceptions import (
+    ClientAuthenticationError,
+    HttpResponseError,
+    ResourceExistsError,
+    ResourceNotFoundError,
+    ResourceNotModifiedError,
+    map_error,
+)
+from azure.core.pipeline import PipelineResponse
+from azure.core.rest import AsyncHttpResponse, HttpRequest
+from azure.core.tracing.decorator import distributed_trace
+from azure.core.utils import case_insensitive_dict
+from azure.mgmt.core.exceptions import ARMErrorFormat
+
+from ... import models as _models
+from ...operations._storage_task_assignments_instances_report_operations import build_list_request
+
+if sys.version_info >= (3, 9):
+    from collections.abc import MutableMapping
+else:
+    from typing import MutableMapping  # type: ignore
+T = TypeVar("T")
+ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
+
+
+class StorageTaskAssignmentsInstancesReportOperations:  # pylint: disable=name-too-long
+    """
+    .. warning::
+        **DO NOT** instantiate this class directly.
+
+        Instead, you should access the following operations through
+        :class:`~azure.mgmt.storage.v2024_01_01.aio.StorageManagementClient`'s
+        :attr:`storage_task_assignments_instances_report` attribute.
+    """
+
+    models = _models
+
+    def __init__(self, *args, **kwargs) -> None:
+        input_args = list(args)
+        self._client = input_args.pop(0) if input_args else kwargs.pop("client")
+        self._config = input_args.pop(0) if input_args else kwargs.pop("config")
+        self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer")
+        self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer")
+        self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version")
+
+    @distributed_trace
+    def list(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        maxpagesize: Optional[int] = None,
+        filter: Optional[str] = None,
+        **kwargs: Any
+    ) -> AsyncIterable["_models.StorageTaskReportInstance"]:
+        # pylint: disable=line-too-long
+        """Fetch the report summary of all the storage task assignments and instances in an account.
+
+        :param resource_group_name: The name of the resource group. The name is case insensitive.
+         Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param maxpagesize: Optional, specifies the maximum number of storage task assignment instances
+         to be included in the list response. Default value is None.
+        :type maxpagesize: int
+        :param filter: Optional. When specified, it can be used to query using reporting properties.
+         See `Constructing Filter Strings
+         <https://learn.microsoft.com/en-us/rest/api/storageservices/querying-tables-and-entities#constructing-filter-strings>`_
+         for details. Default value is None.
+        :type filter: str
+        :return: An iterator like instance of either StorageTaskReportInstance or the result of
+         cls(response)
+        :rtype:
+         ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.storage.v2024_01_01.models.StorageTaskReportInstance]
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.StorageTaskReportSummary] = kwargs.pop("cls", None)
+
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        def prepare_request(next_link=None):
+            if not next_link:
+
+                _request = build_list_request(
+                    resource_group_name=resource_group_name,
+                    account_name=account_name,
+                    subscription_id=self._config.subscription_id,
+                    maxpagesize=maxpagesize,
+                    filter=filter,
+                    api_version=api_version,
+                    headers=_headers,
+                    params=_params,
+                )
+                _request.url = self._client.format_url(_request.url)
+
+            else:
+                # make call to next link with the client's api-version
+                _parsed_next_link = urllib.parse.urlparse(next_link)
+                _next_request_params = case_insensitive_dict(
+                    {
+                        key: [urllib.parse.quote(v) for v in value]
+                        for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items()
+                    }
+                )
+                _next_request_params["api-version"] = self._api_version
+                _request = HttpRequest(
+                    "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
+                )
+                _request.url = self._client.format_url(_request.url)
+                _request.method = "GET"
+            return _request
+
+        async def extract_data(pipeline_response):
+            deserialized = self._deserialize("StorageTaskReportSummary", pipeline_response)
+            list_of_elem = deserialized.value
+            if cls:
+                list_of_elem = cls(list_of_elem)  # type: ignore
+            return deserialized.next_link or None, AsyncList(list_of_elem)
+
+        async def get_next(next_link=None):
+            _request = prepare_request(next_link)
+
+            _stream = False
+            pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+                _request, stream=_stream, **kwargs
+            )
+            response = pipeline_response.http_response
+
+            if response.status_code not in [200]:
+                map_error(status_code=response.status_code, response=response, error_map=error_map)
+                error = self._deserialize.failsafe_deserialize(_models.ErrorResponseAutoGenerated, pipeline_response)
+                raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
+
+            return pipeline_response
+
+        return AsyncItemPaged(get_next, extract_data)
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/operations/_storage_task_assignments_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/operations/_storage_task_assignments_operations.py
new file mode 100644
index 000000000000..0b252065894e
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/operations/_storage_task_assignments_operations.py
@@ -0,0 +1,810 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+from io import IOBase
+import sys
+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
+from azure.core.exceptions import (
+    ClientAuthenticationError,
+    HttpResponseError,
+    ResourceExistsError,
+    ResourceNotFoundError,
+    ResourceNotModifiedError,
+    StreamClosedError,
+    StreamConsumedError,
+    map_error,
+)
+from azure.core.pipeline import PipelineResponse
+from azure.core.polling import AsyncLROPoller, AsyncNoPolling, AsyncPollingMethod
+from azure.core.rest import AsyncHttpResponse, HttpRequest
+from azure.core.tracing.decorator import distributed_trace
+from azure.core.tracing.decorator_async import distributed_trace_async
+from azure.core.utils import case_insensitive_dict
+from azure.mgmt.core.exceptions import ARMErrorFormat
+from azure.mgmt.core.polling.async_arm_polling import AsyncARMPolling
+
+from ... import models as _models
+from ...operations._storage_task_assignments_operations import (
+    build_create_request,
+    build_delete_request,
+    build_get_request,
+    build_list_request,
+    build_update_request,
+)
+
+if sys.version_info >= (3, 9):
+    from collections.abc import MutableMapping
+else:
+    from typing import MutableMapping  # type: ignore
+T = TypeVar("T")
+ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
+
+
+class StorageTaskAssignmentsOperations:
+    """
+    .. warning::
+        **DO NOT** instantiate this class directly.
+
+        Instead, you should access the following operations through
+        :class:`~azure.mgmt.storage.v2024_01_01.aio.StorageManagementClient`'s
+        :attr:`storage_task_assignments` attribute.
+    """
+
+    models = _models
+
+    def __init__(self, *args, **kwargs) -> None:
+        input_args = list(args)
+        self._client = input_args.pop(0) if input_args else kwargs.pop("client")
+        self._config = input_args.pop(0) if input_args else kwargs.pop("config")
+        self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer")
+        self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer")
+        self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version")
+
+    async def _create_initial(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        storage_task_assignment_name: str,
+        parameters: Union[_models.StorageTaskAssignment, IO[bytes]],
+        **kwargs: Any
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _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", self._api_version or "2024-01-01"))
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
+
+        content_type = content_type or "application/json"
+        _json = None
+        _content = None
+        if isinstance(parameters, (IOBase, bytes)):
+            _content = parameters
+        else:
+            _json = self._serialize.body(parameters, "StorageTaskAssignment")
+
+        _request = build_create_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            storage_task_assignment_name=storage_task_assignment_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            content_type=content_type,
+            json=_json,
+            content=_content,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
+        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200, 201, 202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            error = self._deserialize.failsafe_deserialize(_models.ErrorResponseAutoGenerated, pipeline_response)
+            raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
+
+        response_headers = {}
+        if response.status_code == 202:
+            response_headers["Location"] = self._deserialize("str", response.headers.get("Location"))
+
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
+        if cls:
+            return cls(pipeline_response, deserialized, response_headers)  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @overload
+    async def begin_create(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        storage_task_assignment_name: str,
+        parameters: _models.StorageTaskAssignment,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> AsyncLROPoller[_models.StorageTaskAssignment]:
+        """Asynchronously creates a new storage task assignment sub-resource with the specified
+        parameters. If a storage task assignment is already created and a subsequent create request is
+        issued with different properties, the storage task assignment properties will be updated. If a
+        storage task assignment is already created and a subsequent create or update request is issued
+        with the exact same set of properties, the request will succeed.
+
+        :param resource_group_name: The name of the resource group. The name is case insensitive.
+         Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param storage_task_assignment_name: The name of the storage task assignment within the
+         specified resource group. Storage task assignment names must be between 3 and 24 characters in
+         length and use numbers and lower-case letters only. Required.
+        :type storage_task_assignment_name: str
+        :param parameters: The parameters to create a Storage Task Assignment. Required.
+        :type parameters: ~azure.mgmt.storage.v2024_01_01.models.StorageTaskAssignment
+        :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: An instance of AsyncLROPoller that returns either StorageTaskAssignment or the result
+         of cls(response)
+        :rtype:
+         ~azure.core.polling.AsyncLROPoller[~azure.mgmt.storage.v2024_01_01.models.StorageTaskAssignment]
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @overload
+    async def begin_create(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        storage_task_assignment_name: str,
+        parameters: IO[bytes],
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> AsyncLROPoller[_models.StorageTaskAssignment]:
+        """Asynchronously creates a new storage task assignment sub-resource with the specified
+        parameters. If a storage task assignment is already created and a subsequent create request is
+        issued with different properties, the storage task assignment properties will be updated. If a
+        storage task assignment is already created and a subsequent create or update request is issued
+        with the exact same set of properties, the request will succeed.
+
+        :param resource_group_name: The name of the resource group. The name is case insensitive.
+         Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param storage_task_assignment_name: The name of the storage task assignment within the
+         specified resource group. Storage task assignment names must be between 3 and 24 characters in
+         length and use numbers and lower-case letters only. Required.
+        :type storage_task_assignment_name: str
+        :param parameters: The parameters to create a Storage Task Assignment. Required.
+        :type parameters: IO[bytes]
+        :keyword content_type: Body Parameter content-type. Content type parameter for binary body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: An instance of AsyncLROPoller that returns either StorageTaskAssignment or the result
+         of cls(response)
+        :rtype:
+         ~azure.core.polling.AsyncLROPoller[~azure.mgmt.storage.v2024_01_01.models.StorageTaskAssignment]
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @distributed_trace_async
+    async def begin_create(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        storage_task_assignment_name: str,
+        parameters: Union[_models.StorageTaskAssignment, IO[bytes]],
+        **kwargs: Any
+    ) -> AsyncLROPoller[_models.StorageTaskAssignment]:
+        """Asynchronously creates a new storage task assignment sub-resource with the specified
+        parameters. If a storage task assignment is already created and a subsequent create request is
+        issued with different properties, the storage task assignment properties will be updated. If a
+        storage task assignment is already created and a subsequent create or update request is issued
+        with the exact same set of properties, the request will succeed.
+
+        :param resource_group_name: The name of the resource group. The name is case insensitive.
+         Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param storage_task_assignment_name: The name of the storage task assignment within the
+         specified resource group. Storage task assignment names must be between 3 and 24 characters in
+         length and use numbers and lower-case letters only. Required.
+        :type storage_task_assignment_name: str
+        :param parameters: The parameters to create a Storage Task Assignment. Is either a
+         StorageTaskAssignment type or a IO[bytes] type. Required.
+        :type parameters: ~azure.mgmt.storage.v2024_01_01.models.StorageTaskAssignment or IO[bytes]
+        :return: An instance of AsyncLROPoller that returns either StorageTaskAssignment or the result
+         of cls(response)
+        :rtype:
+         ~azure.core.polling.AsyncLROPoller[~azure.mgmt.storage.v2024_01_01.models.StorageTaskAssignment]
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        _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", self._api_version or "2024-01-01"))
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+        cls: ClsType[_models.StorageTaskAssignment] = kwargs.pop("cls", None)
+        polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True)
+        lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
+        cont_token: Optional[str] = kwargs.pop("continuation_token", None)
+        if cont_token is None:
+            raw_result = await self._create_initial(
+                resource_group_name=resource_group_name,
+                account_name=account_name,
+                storage_task_assignment_name=storage_task_assignment_name,
+                parameters=parameters,
+                api_version=api_version,
+                content_type=content_type,
+                cls=lambda x, y, z: x,
+                headers=_headers,
+                params=_params,
+                **kwargs
+            )
+            await raw_result.http_response.read()  # type: ignore
+        kwargs.pop("error_map", None)
+
+        def get_long_running_output(pipeline_response):
+            deserialized = self._deserialize("StorageTaskAssignment", pipeline_response.http_response)
+            if cls:
+                return cls(pipeline_response, deserialized, {})  # type: ignore
+            return deserialized
+
+        if polling is True:
+            polling_method: AsyncPollingMethod = cast(
+                AsyncPollingMethod, AsyncARMPolling(lro_delay, lro_options={"final-state-via": "location"}, **kwargs)
+            )
+        elif polling is False:
+            polling_method = cast(AsyncPollingMethod, AsyncNoPolling())
+        else:
+            polling_method = polling
+        if cont_token:
+            return AsyncLROPoller[_models.StorageTaskAssignment].from_continuation_token(
+                polling_method=polling_method,
+                continuation_token=cont_token,
+                client=self._client,
+                deserialization_callback=get_long_running_output,
+            )
+        return AsyncLROPoller[_models.StorageTaskAssignment](
+            self._client, raw_result, get_long_running_output, polling_method  # type: ignore
+        )
+
+    async def _update_initial(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        storage_task_assignment_name: str,
+        parameters: Union[_models.StorageTaskAssignmentUpdateParameters, IO[bytes]],
+        **kwargs: Any
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _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", self._api_version or "2024-01-01"))
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
+
+        content_type = content_type or "application/json"
+        _json = None
+        _content = None
+        if isinstance(parameters, (IOBase, bytes)):
+            _content = parameters
+        else:
+            _json = self._serialize.body(parameters, "StorageTaskAssignmentUpdateParameters")
+
+        _request = build_update_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            storage_task_assignment_name=storage_task_assignment_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            content_type=content_type,
+            json=_json,
+            content=_content,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
+        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200, 202]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            error = self._deserialize.failsafe_deserialize(_models.ErrorResponseAutoGenerated, pipeline_response)
+            raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
+
+        response_headers = {}
+        if response.status_code == 202:
+            response_headers["Location"] = self._deserialize("str", response.headers.get("Location"))
+
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
+        if cls:
+            return cls(pipeline_response, deserialized, response_headers)  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @overload
+    async def begin_update(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        storage_task_assignment_name: str,
+        parameters: _models.StorageTaskAssignmentUpdateParameters,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> AsyncLROPoller[_models.StorageTaskAssignment]:
+        """Update storage task assignment properties.
+
+        :param resource_group_name: The name of the resource group. The name is case insensitive.
+         Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param storage_task_assignment_name: The name of the storage task assignment within the
+         specified resource group. Storage task assignment names must be between 3 and 24 characters in
+         length and use numbers and lower-case letters only. Required.
+        :type storage_task_assignment_name: str
+        :param parameters: The parameters to update a Storage Task Assignment. Required.
+        :type parameters: ~azure.mgmt.storage.v2024_01_01.models.StorageTaskAssignmentUpdateParameters
+        :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: An instance of AsyncLROPoller that returns either StorageTaskAssignment or the result
+         of cls(response)
+        :rtype:
+         ~azure.core.polling.AsyncLROPoller[~azure.mgmt.storage.v2024_01_01.models.StorageTaskAssignment]
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @overload
+    async def begin_update(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        storage_task_assignment_name: str,
+        parameters: IO[bytes],
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> AsyncLROPoller[_models.StorageTaskAssignment]:
+        """Update storage task assignment properties.
+
+        :param resource_group_name: The name of the resource group. The name is case insensitive.
+         Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param storage_task_assignment_name: The name of the storage task assignment within the
+         specified resource group. Storage task assignment names must be between 3 and 24 characters in
+         length and use numbers and lower-case letters only. Required.
+        :type storage_task_assignment_name: str
+        :param parameters: The parameters to update a Storage Task Assignment. Required.
+        :type parameters: IO[bytes]
+        :keyword content_type: Body Parameter content-type. Content type parameter for binary body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: An instance of AsyncLROPoller that returns either StorageTaskAssignment or the result
+         of cls(response)
+        :rtype:
+         ~azure.core.polling.AsyncLROPoller[~azure.mgmt.storage.v2024_01_01.models.StorageTaskAssignment]
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @distributed_trace_async
+    async def begin_update(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        storage_task_assignment_name: str,
+        parameters: Union[_models.StorageTaskAssignmentUpdateParameters, IO[bytes]],
+        **kwargs: Any
+    ) -> AsyncLROPoller[_models.StorageTaskAssignment]:
+        """Update storage task assignment properties.
+
+        :param resource_group_name: The name of the resource group. The name is case insensitive.
+         Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param storage_task_assignment_name: The name of the storage task assignment within the
+         specified resource group. Storage task assignment names must be between 3 and 24 characters in
+         length and use numbers and lower-case letters only. Required.
+        :type storage_task_assignment_name: str
+        :param parameters: The parameters to update a Storage Task Assignment. Is either a
+         StorageTaskAssignmentUpdateParameters type or a IO[bytes] type. Required.
+        :type parameters: ~azure.mgmt.storage.v2024_01_01.models.StorageTaskAssignmentUpdateParameters
+         or IO[bytes]
+        :return: An instance of AsyncLROPoller that returns either StorageTaskAssignment or the result
+         of cls(response)
+        :rtype:
+         ~azure.core.polling.AsyncLROPoller[~azure.mgmt.storage.v2024_01_01.models.StorageTaskAssignment]
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        _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", self._api_version or "2024-01-01"))
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+        cls: ClsType[_models.StorageTaskAssignment] = kwargs.pop("cls", None)
+        polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True)
+        lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
+        cont_token: Optional[str] = kwargs.pop("continuation_token", None)
+        if cont_token is None:
+            raw_result = await self._update_initial(
+                resource_group_name=resource_group_name,
+                account_name=account_name,
+                storage_task_assignment_name=storage_task_assignment_name,
+                parameters=parameters,
+                api_version=api_version,
+                content_type=content_type,
+                cls=lambda x, y, z: x,
+                headers=_headers,
+                params=_params,
+                **kwargs
+            )
+            await raw_result.http_response.read()  # type: ignore
+        kwargs.pop("error_map", None)
+
+        def get_long_running_output(pipeline_response):
+            deserialized = self._deserialize("StorageTaskAssignment", pipeline_response.http_response)
+            if cls:
+                return cls(pipeline_response, deserialized, {})  # type: ignore
+            return deserialized
+
+        if polling is True:
+            polling_method: AsyncPollingMethod = cast(
+                AsyncPollingMethod, AsyncARMPolling(lro_delay, lro_options={"final-state-via": "location"}, **kwargs)
+            )
+        elif polling is False:
+            polling_method = cast(AsyncPollingMethod, AsyncNoPolling())
+        else:
+            polling_method = polling
+        if cont_token:
+            return AsyncLROPoller[_models.StorageTaskAssignment].from_continuation_token(
+                polling_method=polling_method,
+                continuation_token=cont_token,
+                client=self._client,
+                deserialization_callback=get_long_running_output,
+            )
+        return AsyncLROPoller[_models.StorageTaskAssignment](
+            self._client, raw_result, get_long_running_output, polling_method  # type: ignore
+        )
+
+    @distributed_trace_async
+    async def get(
+        self, resource_group_name: str, account_name: str, storage_task_assignment_name: str, **kwargs: Any
+    ) -> _models.StorageTaskAssignment:
+        """Get the storage task assignment properties.
+
+        :param resource_group_name: The name of the resource group. The name is case insensitive.
+         Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param storage_task_assignment_name: The name of the storage task assignment within the
+         specified resource group. Storage task assignment names must be between 3 and 24 characters in
+         length and use numbers and lower-case letters only. Required.
+        :type storage_task_assignment_name: str
+        :return: StorageTaskAssignment or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.StorageTaskAssignment
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.StorageTaskAssignment] = kwargs.pop("cls", None)
+
+        _request = build_get_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            storage_task_assignment_name=storage_task_assignment_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            error = self._deserialize.failsafe_deserialize(_models.ErrorResponseAutoGenerated, pipeline_response)
+            raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("StorageTaskAssignment", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    async def _delete_initial(
+        self, resource_group_name: str, account_name: str, storage_task_assignment_name: str, **kwargs: Any
+    ) -> AsyncIterator[bytes]:
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[AsyncIterator[bytes]] = kwargs.pop("cls", None)
+
+        _request = build_delete_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            storage_task_assignment_name=storage_task_assignment_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
+        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [202, 204]:
+            try:
+                await response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            error = self._deserialize.failsafe_deserialize(_models.ErrorResponseAutoGenerated, pipeline_response)
+            raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
+
+        response_headers = {}
+        if response.status_code == 202:
+            response_headers["Location"] = self._deserialize("str", response.headers.get("Location"))
+
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
+        if cls:
+            return cls(pipeline_response, deserialized, response_headers)  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @distributed_trace_async
+    async def begin_delete(
+        self, resource_group_name: str, account_name: str, storage_task_assignment_name: str, **kwargs: Any
+    ) -> AsyncLROPoller[None]:
+        """Delete the storage task assignment sub-resource.
+
+        :param resource_group_name: The name of the resource group. The name is case insensitive.
+         Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param storage_task_assignment_name: The name of the storage task assignment within the
+         specified resource group. Storage task assignment names must be between 3 and 24 characters in
+         length and use numbers and lower-case letters only. Required.
+        :type storage_task_assignment_name: str
+        :return: An instance of AsyncLROPoller that returns either None or the result of cls(response)
+        :rtype: ~azure.core.polling.AsyncLROPoller[None]
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[None] = kwargs.pop("cls", None)
+        polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True)
+        lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
+        cont_token: Optional[str] = kwargs.pop("continuation_token", None)
+        if cont_token is None:
+            raw_result = await self._delete_initial(
+                resource_group_name=resource_group_name,
+                account_name=account_name,
+                storage_task_assignment_name=storage_task_assignment_name,
+                api_version=api_version,
+                cls=lambda x, y, z: x,
+                headers=_headers,
+                params=_params,
+                **kwargs
+            )
+            await raw_result.http_response.read()  # type: ignore
+        kwargs.pop("error_map", None)
+
+        def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
+            if cls:
+                return cls(pipeline_response, None, {})  # type: ignore
+
+        if polling is True:
+            polling_method: AsyncPollingMethod = cast(
+                AsyncPollingMethod, AsyncARMPolling(lro_delay, lro_options={"final-state-via": "location"}, **kwargs)
+            )
+        elif polling is False:
+            polling_method = cast(AsyncPollingMethod, AsyncNoPolling())
+        else:
+            polling_method = polling
+        if cont_token:
+            return AsyncLROPoller[None].from_continuation_token(
+                polling_method=polling_method,
+                continuation_token=cont_token,
+                client=self._client,
+                deserialization_callback=get_long_running_output,
+            )
+        return AsyncLROPoller[None](self._client, raw_result, get_long_running_output, polling_method)  # type: ignore
+
+    @distributed_trace
+    def list(
+        self, resource_group_name: str, account_name: str, maxpagesize: Optional[int] = None, **kwargs: Any
+    ) -> AsyncIterable["_models.StorageTaskAssignment"]:
+        """List all the storage task assignments in an account.
+
+        :param resource_group_name: The name of the resource group. The name is case insensitive.
+         Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param maxpagesize: Optional, specifies the maximum number of storage task assignment Ids to be
+         included in the list response. Default value is None.
+        :type maxpagesize: int
+        :return: An iterator like instance of either StorageTaskAssignment or the result of
+         cls(response)
+        :rtype:
+         ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.storage.v2024_01_01.models.StorageTaskAssignment]
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.StorageTaskAssignmentsList] = kwargs.pop("cls", None)
+
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        def prepare_request(next_link=None):
+            if not next_link:
+
+                _request = build_list_request(
+                    resource_group_name=resource_group_name,
+                    account_name=account_name,
+                    subscription_id=self._config.subscription_id,
+                    maxpagesize=maxpagesize,
+                    api_version=api_version,
+                    headers=_headers,
+                    params=_params,
+                )
+                _request.url = self._client.format_url(_request.url)
+
+            else:
+                # make call to next link with the client's api-version
+                _parsed_next_link = urllib.parse.urlparse(next_link)
+                _next_request_params = case_insensitive_dict(
+                    {
+                        key: [urllib.parse.quote(v) for v in value]
+                        for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items()
+                    }
+                )
+                _next_request_params["api-version"] = self._api_version
+                _request = HttpRequest(
+                    "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
+                )
+                _request.url = self._client.format_url(_request.url)
+                _request.method = "GET"
+            return _request
+
+        async def extract_data(pipeline_response):
+            deserialized = self._deserialize("StorageTaskAssignmentsList", pipeline_response)
+            list_of_elem = deserialized.value
+            if cls:
+                list_of_elem = cls(list_of_elem)  # type: ignore
+            return deserialized.next_link or None, AsyncList(list_of_elem)
+
+        async def get_next(next_link=None):
+            _request = prepare_request(next_link)
+
+            _stream = False
+            pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+                _request, stream=_stream, **kwargs
+            )
+            response = pipeline_response.http_response
+
+            if response.status_code not in [200]:
+                map_error(status_code=response.status_code, response=response, error_map=error_map)
+                error = self._deserialize.failsafe_deserialize(_models.ErrorResponseAutoGenerated, pipeline_response)
+                raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
+
+            return pipeline_response
+
+        return AsyncItemPaged(get_next, extract_data)
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/operations/_table_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/operations/_table_operations.py
new file mode 100644
index 000000000000..4302371e22b9
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/operations/_table_operations.py
@@ -0,0 +1,577 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+from io import IOBase
+import sys
+from typing import Any, AsyncIterable, Callable, Dict, IO, Optional, TypeVar, Union, overload
+import urllib.parse
+
+from azure.core.async_paging import AsyncItemPaged, AsyncList
+from azure.core.exceptions import (
+    ClientAuthenticationError,
+    HttpResponseError,
+    ResourceExistsError,
+    ResourceNotFoundError,
+    ResourceNotModifiedError,
+    map_error,
+)
+from azure.core.pipeline import PipelineResponse
+from azure.core.rest import AsyncHttpResponse, HttpRequest
+from azure.core.tracing.decorator import distributed_trace
+from azure.core.tracing.decorator_async import distributed_trace_async
+from azure.core.utils import case_insensitive_dict
+from azure.mgmt.core.exceptions import ARMErrorFormat
+
+from ... import models as _models
+from ...operations._table_operations import (
+    build_create_request,
+    build_delete_request,
+    build_get_request,
+    build_list_request,
+    build_update_request,
+)
+
+if sys.version_info >= (3, 9):
+    from collections.abc import MutableMapping
+else:
+    from typing import MutableMapping  # type: ignore
+T = TypeVar("T")
+ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
+
+
+class TableOperations:
+    """
+    .. warning::
+        **DO NOT** instantiate this class directly.
+
+        Instead, you should access the following operations through
+        :class:`~azure.mgmt.storage.v2024_01_01.aio.StorageManagementClient`'s
+        :attr:`table` attribute.
+    """
+
+    models = _models
+
+    def __init__(self, *args, **kwargs) -> None:
+        input_args = list(args)
+        self._client = input_args.pop(0) if input_args else kwargs.pop("client")
+        self._config = input_args.pop(0) if input_args else kwargs.pop("config")
+        self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer")
+        self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer")
+        self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version")
+
+    @overload
+    async def create(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        table_name: str,
+        parameters: Optional[_models.Table] = None,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.Table:
+        """Creates a new table with the specified table name, under the specified account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param table_name: A table name must be unique within a storage account and must be between 3
+         and 63 characters.The name must comprise of only alphanumeric characters and it cannot begin
+         with a numeric character. Required.
+        :type table_name: str
+        :param parameters: The parameters to provide to create a table. Default value is None.
+        :type parameters: ~azure.mgmt.storage.v2024_01_01.models.Table
+        :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: Table or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.Table
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @overload
+    async def create(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        table_name: str,
+        parameters: Optional[IO[bytes]] = None,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.Table:
+        """Creates a new table with the specified table name, under the specified account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param table_name: A table name must be unique within a storage account and must be between 3
+         and 63 characters.The name must comprise of only alphanumeric characters and it cannot begin
+         with a numeric character. Required.
+        :type table_name: str
+        :param parameters: The parameters to provide to create a table. Default value is None.
+        :type parameters: IO[bytes]
+        :keyword content_type: Body Parameter content-type. Content type parameter for binary body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: Table or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.Table
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @distributed_trace_async
+    async def create(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        table_name: str,
+        parameters: Optional[Union[_models.Table, IO[bytes]]] = None,
+        **kwargs: Any
+    ) -> _models.Table:
+        """Creates a new table with the specified table name, under the specified account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param table_name: A table name must be unique within a storage account and must be between 3
+         and 63 characters.The name must comprise of only alphanumeric characters and it cannot begin
+         with a numeric character. Required.
+        :type table_name: str
+        :param parameters: The parameters to provide to create a table. Is either a Table type or a
+         IO[bytes] type. Default value is None.
+        :type parameters: ~azure.mgmt.storage.v2024_01_01.models.Table or IO[bytes]
+        :return: Table or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.Table
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _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", self._api_version or "2024-01-01"))
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+        cls: ClsType[_models.Table] = kwargs.pop("cls", None)
+
+        content_type = content_type or "application/json"
+        _json = None
+        _content = None
+        if isinstance(parameters, (IOBase, bytes)):
+            _content = parameters
+        else:
+            if parameters is not None:
+                _json = self._serialize.body(parameters, "Table")
+            else:
+                _json = None
+
+        _request = build_create_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            table_name=table_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            content_type=content_type,
+            json=_json,
+            content=_content,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("Table", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @overload
+    async def update(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        table_name: str,
+        parameters: Optional[_models.Table] = None,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.Table:
+        """Creates a new table with the specified table name, under the specified account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param table_name: A table name must be unique within a storage account and must be between 3
+         and 63 characters.The name must comprise of only alphanumeric characters and it cannot begin
+         with a numeric character. Required.
+        :type table_name: str
+        :param parameters: The parameters to provide to create a table. Default value is None.
+        :type parameters: ~azure.mgmt.storage.v2024_01_01.models.Table
+        :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: Table or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.Table
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @overload
+    async def update(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        table_name: str,
+        parameters: Optional[IO[bytes]] = None,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.Table:
+        """Creates a new table with the specified table name, under the specified account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param table_name: A table name must be unique within a storage account and must be between 3
+         and 63 characters.The name must comprise of only alphanumeric characters and it cannot begin
+         with a numeric character. Required.
+        :type table_name: str
+        :param parameters: The parameters to provide to create a table. Default value is None.
+        :type parameters: IO[bytes]
+        :keyword content_type: Body Parameter content-type. Content type parameter for binary body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: Table or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.Table
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @distributed_trace_async
+    async def update(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        table_name: str,
+        parameters: Optional[Union[_models.Table, IO[bytes]]] = None,
+        **kwargs: Any
+    ) -> _models.Table:
+        """Creates a new table with the specified table name, under the specified account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param table_name: A table name must be unique within a storage account and must be between 3
+         and 63 characters.The name must comprise of only alphanumeric characters and it cannot begin
+         with a numeric character. Required.
+        :type table_name: str
+        :param parameters: The parameters to provide to create a table. Is either a Table type or a
+         IO[bytes] type. Default value is None.
+        :type parameters: ~azure.mgmt.storage.v2024_01_01.models.Table or IO[bytes]
+        :return: Table or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.Table
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _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", self._api_version or "2024-01-01"))
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+        cls: ClsType[_models.Table] = kwargs.pop("cls", None)
+
+        content_type = content_type or "application/json"
+        _json = None
+        _content = None
+        if isinstance(parameters, (IOBase, bytes)):
+            _content = parameters
+        else:
+            if parameters is not None:
+                _json = self._serialize.body(parameters, "Table")
+            else:
+                _json = None
+
+        _request = build_update_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            table_name=table_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            content_type=content_type,
+            json=_json,
+            content=_content,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("Table", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @distributed_trace_async
+    async def get(self, resource_group_name: str, account_name: str, table_name: str, **kwargs: Any) -> _models.Table:
+        """Gets the table with the specified table name, under the specified account if it exists.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param table_name: A table name must be unique within a storage account and must be between 3
+         and 63 characters.The name must comprise of only alphanumeric characters and it cannot begin
+         with a numeric character. Required.
+        :type table_name: str
+        :return: Table or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.Table
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.Table] = kwargs.pop("cls", None)
+
+        _request = build_get_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            table_name=table_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("Table", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @distributed_trace_async
+    async def delete(self, resource_group_name: str, account_name: str, table_name: str, **kwargs: Any) -> None:
+        """Deletes the table with the specified table name, under the specified account if it exists.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param table_name: A table name must be unique within a storage account and must be between 3
+         and 63 characters.The name must comprise of only alphanumeric characters and it cannot begin
+         with a numeric character. Required.
+        :type table_name: str
+        :return: None or the result of cls(response)
+        :rtype: None
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[None] = kwargs.pop("cls", None)
+
+        _request = build_delete_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            table_name=table_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [204]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        if cls:
+            return cls(pipeline_response, None, {})  # type: ignore
+
+    @distributed_trace
+    def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> AsyncIterable["_models.Table"]:
+        """Gets a list of all the tables under the specified storage account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :return: An iterator like instance of either Table or the result of cls(response)
+        :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.storage.v2024_01_01.models.Table]
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.ListTableResource] = kwargs.pop("cls", None)
+
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        def prepare_request(next_link=None):
+            if not next_link:
+
+                _request = build_list_request(
+                    resource_group_name=resource_group_name,
+                    account_name=account_name,
+                    subscription_id=self._config.subscription_id,
+                    api_version=api_version,
+                    headers=_headers,
+                    params=_params,
+                )
+                _request.url = self._client.format_url(_request.url)
+
+            else:
+                # make call to next link with the client's api-version
+                _parsed_next_link = urllib.parse.urlparse(next_link)
+                _next_request_params = case_insensitive_dict(
+                    {
+                        key: [urllib.parse.quote(v) for v in value]
+                        for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items()
+                    }
+                )
+                _next_request_params["api-version"] = self._api_version
+                _request = HttpRequest(
+                    "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
+                )
+                _request.url = self._client.format_url(_request.url)
+                _request.method = "GET"
+            return _request
+
+        async def extract_data(pipeline_response):
+            deserialized = self._deserialize("ListTableResource", pipeline_response)
+            list_of_elem = deserialized.value
+            if cls:
+                list_of_elem = cls(list_of_elem)  # type: ignore
+            return deserialized.next_link or None, AsyncList(list_of_elem)
+
+        async def get_next(next_link=None):
+            _request = prepare_request(next_link)
+
+            _stream = False
+            pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+                _request, stream=_stream, **kwargs
+            )
+            response = pipeline_response.http_response
+
+            if response.status_code not in [200]:
+                map_error(status_code=response.status_code, response=response, error_map=error_map)
+                raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+            return pipeline_response
+
+        return AsyncItemPaged(get_next, extract_data)
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/operations/_table_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/operations/_table_services_operations.py
new file mode 100644
index 000000000000..0f9e09b16508
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/operations/_table_services_operations.py
@@ -0,0 +1,322 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+from io import IOBase
+import sys
+from typing import Any, Callable, Dict, IO, Literal, Optional, TypeVar, Union, overload
+
+from azure.core.exceptions import (
+    ClientAuthenticationError,
+    HttpResponseError,
+    ResourceExistsError,
+    ResourceNotFoundError,
+    ResourceNotModifiedError,
+    map_error,
+)
+from azure.core.pipeline import PipelineResponse
+from azure.core.rest import AsyncHttpResponse, HttpRequest
+from azure.core.tracing.decorator_async import distributed_trace_async
+from azure.core.utils import case_insensitive_dict
+from azure.mgmt.core.exceptions import ARMErrorFormat
+
+from ... import models as _models
+from ...operations._table_services_operations import (
+    build_get_service_properties_request,
+    build_list_request,
+    build_set_service_properties_request,
+)
+
+if sys.version_info >= (3, 9):
+    from collections.abc import MutableMapping
+else:
+    from typing import MutableMapping  # type: ignore
+T = TypeVar("T")
+ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
+
+
+class TableServicesOperations:
+    """
+    .. warning::
+        **DO NOT** instantiate this class directly.
+
+        Instead, you should access the following operations through
+        :class:`~azure.mgmt.storage.v2024_01_01.aio.StorageManagementClient`'s
+        :attr:`table_services` attribute.
+    """
+
+    models = _models
+
+    def __init__(self, *args, **kwargs) -> None:
+        input_args = list(args)
+        self._client = input_args.pop(0) if input_args else kwargs.pop("client")
+        self._config = input_args.pop(0) if input_args else kwargs.pop("config")
+        self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer")
+        self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer")
+        self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version")
+
+    @distributed_trace_async
+    async def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _models.ListTableServices:
+        """List all table services for the storage account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :return: ListTableServices or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.ListTableServices
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.ListTableServices] = kwargs.pop("cls", None)
+
+        _request = build_list_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("ListTableServices", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @overload
+    async def set_service_properties(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        parameters: _models.TableServiceProperties,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.TableServiceProperties:
+        """Sets the properties of a storage account’s Table service, including properties for Storage
+        Analytics and CORS (Cross-Origin Resource Sharing) rules.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param parameters: The properties of a storage account’s Table service, only properties for
+         Storage Analytics and CORS (Cross-Origin Resource Sharing) rules can be specified. Required.
+        :type parameters: ~azure.mgmt.storage.v2024_01_01.models.TableServiceProperties
+        :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: TableServiceProperties or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.TableServiceProperties
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @overload
+    async def set_service_properties(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        parameters: IO[bytes],
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.TableServiceProperties:
+        """Sets the properties of a storage account’s Table service, including properties for Storage
+        Analytics and CORS (Cross-Origin Resource Sharing) rules.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param parameters: The properties of a storage account’s Table service, only properties for
+         Storage Analytics and CORS (Cross-Origin Resource Sharing) rules can be specified. Required.
+        :type parameters: IO[bytes]
+        :keyword content_type: Body Parameter content-type. Content type parameter for binary body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: TableServiceProperties or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.TableServiceProperties
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @distributed_trace_async
+    async def set_service_properties(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        parameters: Union[_models.TableServiceProperties, IO[bytes]],
+        **kwargs: Any
+    ) -> _models.TableServiceProperties:
+        """Sets the properties of a storage account’s Table service, including properties for Storage
+        Analytics and CORS (Cross-Origin Resource Sharing) rules.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param parameters: The properties of a storage account’s Table service, only properties for
+         Storage Analytics and CORS (Cross-Origin Resource Sharing) rules can be specified. Is either a
+         TableServiceProperties type or a IO[bytes] type. Required.
+        :type parameters: ~azure.mgmt.storage.v2024_01_01.models.TableServiceProperties or IO[bytes]
+        :return: TableServiceProperties or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.TableServiceProperties
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _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", self._api_version or "2024-01-01"))
+        table_service_name: Literal["default"] = kwargs.pop("table_service_name", "default")
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+        cls: ClsType[_models.TableServiceProperties] = kwargs.pop("cls", None)
+
+        content_type = content_type or "application/json"
+        _json = None
+        _content = None
+        if isinstance(parameters, (IOBase, bytes)):
+            _content = parameters
+        else:
+            _json = self._serialize.body(parameters, "TableServiceProperties")
+
+        _request = build_set_service_properties_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            table_service_name=table_service_name,
+            content_type=content_type,
+            json=_json,
+            content=_content,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("TableServiceProperties", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @distributed_trace_async
+    async def get_service_properties(
+        self, resource_group_name: str, account_name: str, **kwargs: Any
+    ) -> _models.TableServiceProperties:
+        """Gets the properties of a storage account’s Table service, including properties for Storage
+        Analytics and CORS (Cross-Origin Resource Sharing) rules.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :return: TableServiceProperties or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.TableServiceProperties
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        table_service_name: Literal["default"] = kwargs.pop("table_service_name", "default")
+        cls: ClsType[_models.TableServiceProperties] = kwargs.pop("cls", None)
+
+        _request = build_get_service_properties_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            table_service_name=table_service_name,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("TableServiceProperties", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/operations/_usages_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/operations/_usages_operations.py
new file mode 100644
index 000000000000..799d1ca52f24
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/aio/operations/_usages_operations.py
@@ -0,0 +1,134 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+import sys
+from typing import Any, AsyncIterable, Callable, Dict, Optional, TypeVar
+import urllib.parse
+
+from azure.core.async_paging import AsyncItemPaged, AsyncList
+from azure.core.exceptions import (
+    ClientAuthenticationError,
+    HttpResponseError,
+    ResourceExistsError,
+    ResourceNotFoundError,
+    ResourceNotModifiedError,
+    map_error,
+)
+from azure.core.pipeline import PipelineResponse
+from azure.core.rest import AsyncHttpResponse, HttpRequest
+from azure.core.tracing.decorator import distributed_trace
+from azure.core.utils import case_insensitive_dict
+from azure.mgmt.core.exceptions import ARMErrorFormat
+
+from ... import models as _models
+from ...operations._usages_operations import build_list_by_location_request
+
+if sys.version_info >= (3, 9):
+    from collections.abc import MutableMapping
+else:
+    from typing import MutableMapping  # type: ignore
+T = TypeVar("T")
+ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
+
+
+class UsagesOperations:
+    """
+    .. warning::
+        **DO NOT** instantiate this class directly.
+
+        Instead, you should access the following operations through
+        :class:`~azure.mgmt.storage.v2024_01_01.aio.StorageManagementClient`'s
+        :attr:`usages` attribute.
+    """
+
+    models = _models
+
+    def __init__(self, *args, **kwargs) -> None:
+        input_args = list(args)
+        self._client = input_args.pop(0) if input_args else kwargs.pop("client")
+        self._config = input_args.pop(0) if input_args else kwargs.pop("config")
+        self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer")
+        self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer")
+        self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version")
+
+    @distributed_trace
+    def list_by_location(self, location: str, **kwargs: Any) -> AsyncIterable["_models.Usage"]:
+        """Gets the current usage count and the limit for the resources of the location under the
+        subscription.
+
+        :param location: The location of the Azure Storage resource. Required.
+        :type location: str
+        :return: An iterator like instance of either Usage or the result of cls(response)
+        :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.storage.v2024_01_01.models.Usage]
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.UsageListResult] = kwargs.pop("cls", None)
+
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        def prepare_request(next_link=None):
+            if not next_link:
+
+                _request = build_list_by_location_request(
+                    location=location,
+                    subscription_id=self._config.subscription_id,
+                    api_version=api_version,
+                    headers=_headers,
+                    params=_params,
+                )
+                _request.url = self._client.format_url(_request.url)
+
+            else:
+                # make call to next link with the client's api-version
+                _parsed_next_link = urllib.parse.urlparse(next_link)
+                _next_request_params = case_insensitive_dict(
+                    {
+                        key: [urllib.parse.quote(v) for v in value]
+                        for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items()
+                    }
+                )
+                _next_request_params["api-version"] = self._api_version
+                _request = HttpRequest(
+                    "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
+                )
+                _request.url = self._client.format_url(_request.url)
+                _request.method = "GET"
+            return _request
+
+        async def extract_data(pipeline_response):
+            deserialized = self._deserialize("UsageListResult", pipeline_response)
+            list_of_elem = deserialized.value
+            if cls:
+                list_of_elem = cls(list_of_elem)  # type: ignore
+            return None, AsyncList(list_of_elem)
+
+        async def get_next(next_link=None):
+            _request = prepare_request(next_link)
+
+            _stream = False
+            pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
+                _request, stream=_stream, **kwargs
+            )
+            response = pipeline_response.http_response
+
+            if response.status_code not in [200]:
+                map_error(status_code=response.status_code, response=response, error_map=error_map)
+                raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+            return pipeline_response
+
+        return AsyncItemPaged(get_next, extract_data)
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/models/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/models/__init__.py
new file mode 100644
index 000000000000..a96fb656d625
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/models/__init__.py
@@ -0,0 +1,570 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+# pylint: disable=wrong-import-position
+
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+
+from ._models_py3 import (  # type: ignore
+    AccessPolicy,
+    AccountImmutabilityPolicyProperties,
+    AccountLimits,
+    AccountSasParameters,
+    AccountUsage,
+    AccountUsageElements,
+    ActiveDirectoryProperties,
+    AzureEntityResource,
+    AzureFilesIdentityBasedAuthentication,
+    BlobContainer,
+    BlobInventoryCreationTime,
+    BlobInventoryPolicy,
+    BlobInventoryPolicyDefinition,
+    BlobInventoryPolicyFilter,
+    BlobInventoryPolicyRule,
+    BlobInventoryPolicySchema,
+    BlobRestoreParameters,
+    BlobRestoreRange,
+    BlobRestoreStatus,
+    BlobServiceItems,
+    BlobServiceProperties,
+    BurstingConstants,
+    ChangeFeed,
+    CheckNameAvailabilityResult,
+    CloudErrorBody,
+    CorsRule,
+    CorsRules,
+    CustomDomain,
+    DateAfterCreation,
+    DateAfterModification,
+    DeleteRetentionPolicy,
+    DeletedAccount,
+    DeletedAccountListResult,
+    DeletedShare,
+    Dimension,
+    Encryption,
+    EncryptionIdentity,
+    EncryptionScope,
+    EncryptionScopeKeyVaultProperties,
+    EncryptionScopeListResult,
+    EncryptionService,
+    EncryptionServices,
+    Endpoints,
+    ErrorAdditionalInfo,
+    ErrorDetail,
+    ErrorResponse,
+    ErrorResponseAutoGenerated,
+    ErrorResponseBody,
+    ExecutionTarget,
+    ExecutionTrigger,
+    ExecutionTriggerUpdate,
+    ExtendedLocation,
+    FileServiceItems,
+    FileServiceProperties,
+    FileServiceUsage,
+    FileServiceUsageProperties,
+    FileServiceUsages,
+    FileShare,
+    FileShareItem,
+    FileShareItems,
+    FileShareLimits,
+    FileSharePropertiesFileSharePaidBursting,
+    FileShareRecommendations,
+    GeoReplicationStats,
+    IPRule,
+    Identity,
+    ImmutabilityPolicy,
+    ImmutabilityPolicyProperties,
+    ImmutableStorageAccount,
+    ImmutableStorageWithVersioning,
+    KeyCreationTime,
+    KeyPolicy,
+    KeyVaultProperties,
+    LastAccessTimeTrackingPolicy,
+    LeaseContainerRequest,
+    LeaseContainerResponse,
+    LeaseShareRequest,
+    LeaseShareResponse,
+    LegalHold,
+    LegalHoldProperties,
+    ListAccountSasResponse,
+    ListBlobInventoryPolicy,
+    ListContainerItem,
+    ListContainerItems,
+    ListQueue,
+    ListQueueResource,
+    ListQueueServices,
+    ListServiceSasResponse,
+    ListTableResource,
+    ListTableServices,
+    LocalUser,
+    LocalUserKeys,
+    LocalUserRegeneratePasswordResult,
+    LocalUsers,
+    ManagementPolicy,
+    ManagementPolicyAction,
+    ManagementPolicyBaseBlob,
+    ManagementPolicyDefinition,
+    ManagementPolicyFilter,
+    ManagementPolicyRule,
+    ManagementPolicySchema,
+    ManagementPolicySnapShot,
+    ManagementPolicyVersion,
+    MetricSpecification,
+    Multichannel,
+    NetworkRuleSet,
+    NetworkSecurityPerimeter,
+    NetworkSecurityPerimeterConfiguration,
+    NetworkSecurityPerimeterConfigurationList,
+    NetworkSecurityPerimeterConfigurationPropertiesProfile,
+    NetworkSecurityPerimeterConfigurationPropertiesResourceAssociation,
+    NspAccessRule,
+    NspAccessRuleProperties,
+    NspAccessRulePropertiesSubscriptionsItem,
+    ObjectReplicationPolicies,
+    ObjectReplicationPolicy,
+    ObjectReplicationPolicyFilter,
+    ObjectReplicationPolicyPropertiesMetrics,
+    ObjectReplicationPolicyRule,
+    Operation,
+    OperationDisplay,
+    OperationListResult,
+    PermissionScope,
+    PrivateEndpoint,
+    PrivateEndpointConnection,
+    PrivateEndpointConnectionListResult,
+    PrivateLinkResource,
+    PrivateLinkResourceListResult,
+    PrivateLinkServiceConnectionState,
+    ProtectedAppendWritesHistory,
+    ProtocolSettings,
+    ProvisioningIssue,
+    ProvisioningIssueProperties,
+    ProxyResource,
+    ProxyResourceAutoGenerated,
+    QueueServiceProperties,
+    Resource,
+    ResourceAccessRule,
+    ResourceAutoGenerated,
+    RestorePolicyProperties,
+    Restriction,
+    RoutingPreference,
+    SKUCapability,
+    SasPolicy,
+    ServiceSasParameters,
+    ServiceSpecification,
+    SignedIdentifier,
+    Sku,
+    SkuInformation,
+    SmbSetting,
+    SshPublicKey,
+    StorageAccount,
+    StorageAccountCheckNameAvailabilityParameters,
+    StorageAccountCreateParameters,
+    StorageAccountInternetEndpoints,
+    StorageAccountKey,
+    StorageAccountListKeysResult,
+    StorageAccountListResult,
+    StorageAccountMicrosoftEndpoints,
+    StorageAccountMigration,
+    StorageAccountRegenerateKeyParameters,
+    StorageAccountSkuConversionStatus,
+    StorageAccountUpdateParameters,
+    StorageQueue,
+    StorageSkuListResult,
+    StorageTaskAssignment,
+    StorageTaskAssignmentExecutionContext,
+    StorageTaskAssignmentProperties,
+    StorageTaskAssignmentReport,
+    StorageTaskAssignmentUpdateExecutionContext,
+    StorageTaskAssignmentUpdateParameters,
+    StorageTaskAssignmentUpdateProperties,
+    StorageTaskAssignmentUpdateReport,
+    StorageTaskAssignmentsList,
+    StorageTaskReportInstance,
+    StorageTaskReportProperties,
+    StorageTaskReportSummary,
+    SystemData,
+    Table,
+    TableAccessPolicy,
+    TableServiceProperties,
+    TableSignedIdentifier,
+    TagFilter,
+    TagProperty,
+    TrackedResource,
+    TriggerParameters,
+    TriggerParametersUpdate,
+    UpdateHistoryProperty,
+    Usage,
+    UsageListResult,
+    UsageName,
+    UserAssignedIdentity,
+    VirtualNetworkRule,
+)
+
+from ._storage_management_client_enums import (  # type: ignore
+    AccessTier,
+    AccountImmutabilityPolicyState,
+    AccountStatus,
+    AccountType,
+    AllowedCopyScope,
+    AllowedMethods,
+    BlobInventoryPolicyName,
+    BlobRestoreProgressStatus,
+    Bypass,
+    CreatedByType,
+    DefaultAction,
+    DefaultSharePermission,
+    DirectoryServiceOptions,
+    DnsEndpointType,
+    EnabledProtocols,
+    EncryptionScopeSource,
+    EncryptionScopeState,
+    ExpirationAction,
+    ExtendedLocationTypes,
+    Format,
+    GeoReplicationStatus,
+    HttpProtocol,
+    IdentityType,
+    ImmutabilityPolicyState,
+    ImmutabilityPolicyUpdateType,
+    InventoryRuleType,
+    IssueType,
+    KeyPermission,
+    KeySource,
+    KeyType,
+    Kind,
+    LargeFileSharesState,
+    LeaseContainerRequestEnum,
+    LeaseDuration,
+    LeaseShareAction,
+    LeaseState,
+    LeaseStatus,
+    ListContainersInclude,
+    ListEncryptionScopesInclude,
+    ListLocalUserIncludeParam,
+    ManagementPolicyName,
+    MigrationName,
+    MigrationState,
+    MigrationStatus,
+    MinimumTlsVersion,
+    Name,
+    NetworkSecurityPerimeterConfigurationProvisioningState,
+    NspAccessRuleDirection,
+    ObjectType,
+    Permissions,
+    PostFailoverRedundancy,
+    PostPlannedFailoverRedundancy,
+    PrivateEndpointConnectionProvisioningState,
+    PrivateEndpointServiceConnectionStatus,
+    ProvisioningState,
+    PublicAccess,
+    PublicNetworkAccess,
+    Reason,
+    ReasonCode,
+    ResourceAssociationAccessMode,
+    RootSquashType,
+    RoutingChoice,
+    RuleType,
+    RunResult,
+    RunStatusEnum,
+    Schedule,
+    Services,
+    Severity,
+    ShareAccessTier,
+    SignedResource,
+    SignedResourceTypes,
+    SkuConversionStatus,
+    SkuName,
+    SkuTier,
+    State,
+    StorageAccountExpand,
+    TriggerType,
+    UsageUnit,
+)
+from ._patch import __all__ as _patch_all
+from ._patch import *
+from ._patch import patch_sdk as _patch_sdk
+
+__all__ = [
+    "AccessPolicy",
+    "AccountImmutabilityPolicyProperties",
+    "AccountLimits",
+    "AccountSasParameters",
+    "AccountUsage",
+    "AccountUsageElements",
+    "ActiveDirectoryProperties",
+    "AzureEntityResource",
+    "AzureFilesIdentityBasedAuthentication",
+    "BlobContainer",
+    "BlobInventoryCreationTime",
+    "BlobInventoryPolicy",
+    "BlobInventoryPolicyDefinition",
+    "BlobInventoryPolicyFilter",
+    "BlobInventoryPolicyRule",
+    "BlobInventoryPolicySchema",
+    "BlobRestoreParameters",
+    "BlobRestoreRange",
+    "BlobRestoreStatus",
+    "BlobServiceItems",
+    "BlobServiceProperties",
+    "BurstingConstants",
+    "ChangeFeed",
+    "CheckNameAvailabilityResult",
+    "CloudErrorBody",
+    "CorsRule",
+    "CorsRules",
+    "CustomDomain",
+    "DateAfterCreation",
+    "DateAfterModification",
+    "DeleteRetentionPolicy",
+    "DeletedAccount",
+    "DeletedAccountListResult",
+    "DeletedShare",
+    "Dimension",
+    "Encryption",
+    "EncryptionIdentity",
+    "EncryptionScope",
+    "EncryptionScopeKeyVaultProperties",
+    "EncryptionScopeListResult",
+    "EncryptionService",
+    "EncryptionServices",
+    "Endpoints",
+    "ErrorAdditionalInfo",
+    "ErrorDetail",
+    "ErrorResponse",
+    "ErrorResponseAutoGenerated",
+    "ErrorResponseBody",
+    "ExecutionTarget",
+    "ExecutionTrigger",
+    "ExecutionTriggerUpdate",
+    "ExtendedLocation",
+    "FileServiceItems",
+    "FileServiceProperties",
+    "FileServiceUsage",
+    "FileServiceUsageProperties",
+    "FileServiceUsages",
+    "FileShare",
+    "FileShareItem",
+    "FileShareItems",
+    "FileShareLimits",
+    "FileSharePropertiesFileSharePaidBursting",
+    "FileShareRecommendations",
+    "GeoReplicationStats",
+    "IPRule",
+    "Identity",
+    "ImmutabilityPolicy",
+    "ImmutabilityPolicyProperties",
+    "ImmutableStorageAccount",
+    "ImmutableStorageWithVersioning",
+    "KeyCreationTime",
+    "KeyPolicy",
+    "KeyVaultProperties",
+    "LastAccessTimeTrackingPolicy",
+    "LeaseContainerRequest",
+    "LeaseContainerResponse",
+    "LeaseShareRequest",
+    "LeaseShareResponse",
+    "LegalHold",
+    "LegalHoldProperties",
+    "ListAccountSasResponse",
+    "ListBlobInventoryPolicy",
+    "ListContainerItem",
+    "ListContainerItems",
+    "ListQueue",
+    "ListQueueResource",
+    "ListQueueServices",
+    "ListServiceSasResponse",
+    "ListTableResource",
+    "ListTableServices",
+    "LocalUser",
+    "LocalUserKeys",
+    "LocalUserRegeneratePasswordResult",
+    "LocalUsers",
+    "ManagementPolicy",
+    "ManagementPolicyAction",
+    "ManagementPolicyBaseBlob",
+    "ManagementPolicyDefinition",
+    "ManagementPolicyFilter",
+    "ManagementPolicyRule",
+    "ManagementPolicySchema",
+    "ManagementPolicySnapShot",
+    "ManagementPolicyVersion",
+    "MetricSpecification",
+    "Multichannel",
+    "NetworkRuleSet",
+    "NetworkSecurityPerimeter",
+    "NetworkSecurityPerimeterConfiguration",
+    "NetworkSecurityPerimeterConfigurationList",
+    "NetworkSecurityPerimeterConfigurationPropertiesProfile",
+    "NetworkSecurityPerimeterConfigurationPropertiesResourceAssociation",
+    "NspAccessRule",
+    "NspAccessRuleProperties",
+    "NspAccessRulePropertiesSubscriptionsItem",
+    "ObjectReplicationPolicies",
+    "ObjectReplicationPolicy",
+    "ObjectReplicationPolicyFilter",
+    "ObjectReplicationPolicyPropertiesMetrics",
+    "ObjectReplicationPolicyRule",
+    "Operation",
+    "OperationDisplay",
+    "OperationListResult",
+    "PermissionScope",
+    "PrivateEndpoint",
+    "PrivateEndpointConnection",
+    "PrivateEndpointConnectionListResult",
+    "PrivateLinkResource",
+    "PrivateLinkResourceListResult",
+    "PrivateLinkServiceConnectionState",
+    "ProtectedAppendWritesHistory",
+    "ProtocolSettings",
+    "ProvisioningIssue",
+    "ProvisioningIssueProperties",
+    "ProxyResource",
+    "ProxyResourceAutoGenerated",
+    "QueueServiceProperties",
+    "Resource",
+    "ResourceAccessRule",
+    "ResourceAutoGenerated",
+    "RestorePolicyProperties",
+    "Restriction",
+    "RoutingPreference",
+    "SKUCapability",
+    "SasPolicy",
+    "ServiceSasParameters",
+    "ServiceSpecification",
+    "SignedIdentifier",
+    "Sku",
+    "SkuInformation",
+    "SmbSetting",
+    "SshPublicKey",
+    "StorageAccount",
+    "StorageAccountCheckNameAvailabilityParameters",
+    "StorageAccountCreateParameters",
+    "StorageAccountInternetEndpoints",
+    "StorageAccountKey",
+    "StorageAccountListKeysResult",
+    "StorageAccountListResult",
+    "StorageAccountMicrosoftEndpoints",
+    "StorageAccountMigration",
+    "StorageAccountRegenerateKeyParameters",
+    "StorageAccountSkuConversionStatus",
+    "StorageAccountUpdateParameters",
+    "StorageQueue",
+    "StorageSkuListResult",
+    "StorageTaskAssignment",
+    "StorageTaskAssignmentExecutionContext",
+    "StorageTaskAssignmentProperties",
+    "StorageTaskAssignmentReport",
+    "StorageTaskAssignmentUpdateExecutionContext",
+    "StorageTaskAssignmentUpdateParameters",
+    "StorageTaskAssignmentUpdateProperties",
+    "StorageTaskAssignmentUpdateReport",
+    "StorageTaskAssignmentsList",
+    "StorageTaskReportInstance",
+    "StorageTaskReportProperties",
+    "StorageTaskReportSummary",
+    "SystemData",
+    "Table",
+    "TableAccessPolicy",
+    "TableServiceProperties",
+    "TableSignedIdentifier",
+    "TagFilter",
+    "TagProperty",
+    "TrackedResource",
+    "TriggerParameters",
+    "TriggerParametersUpdate",
+    "UpdateHistoryProperty",
+    "Usage",
+    "UsageListResult",
+    "UsageName",
+    "UserAssignedIdentity",
+    "VirtualNetworkRule",
+    "AccessTier",
+    "AccountImmutabilityPolicyState",
+    "AccountStatus",
+    "AccountType",
+    "AllowedCopyScope",
+    "AllowedMethods",
+    "BlobInventoryPolicyName",
+    "BlobRestoreProgressStatus",
+    "Bypass",
+    "CreatedByType",
+    "DefaultAction",
+    "DefaultSharePermission",
+    "DirectoryServiceOptions",
+    "DnsEndpointType",
+    "EnabledProtocols",
+    "EncryptionScopeSource",
+    "EncryptionScopeState",
+    "ExpirationAction",
+    "ExtendedLocationTypes",
+    "Format",
+    "GeoReplicationStatus",
+    "HttpProtocol",
+    "IdentityType",
+    "ImmutabilityPolicyState",
+    "ImmutabilityPolicyUpdateType",
+    "InventoryRuleType",
+    "IssueType",
+    "KeyPermission",
+    "KeySource",
+    "KeyType",
+    "Kind",
+    "LargeFileSharesState",
+    "LeaseContainerRequestEnum",
+    "LeaseDuration",
+    "LeaseShareAction",
+    "LeaseState",
+    "LeaseStatus",
+    "ListContainersInclude",
+    "ListEncryptionScopesInclude",
+    "ListLocalUserIncludeParam",
+    "ManagementPolicyName",
+    "MigrationName",
+    "MigrationState",
+    "MigrationStatus",
+    "MinimumTlsVersion",
+    "Name",
+    "NetworkSecurityPerimeterConfigurationProvisioningState",
+    "NspAccessRuleDirection",
+    "ObjectType",
+    "Permissions",
+    "PostFailoverRedundancy",
+    "PostPlannedFailoverRedundancy",
+    "PrivateEndpointConnectionProvisioningState",
+    "PrivateEndpointServiceConnectionStatus",
+    "ProvisioningState",
+    "PublicAccess",
+    "PublicNetworkAccess",
+    "Reason",
+    "ReasonCode",
+    "ResourceAssociationAccessMode",
+    "RootSquashType",
+    "RoutingChoice",
+    "RuleType",
+    "RunResult",
+    "RunStatusEnum",
+    "Schedule",
+    "Services",
+    "Severity",
+    "ShareAccessTier",
+    "SignedResource",
+    "SignedResourceTypes",
+    "SkuConversionStatus",
+    "SkuName",
+    "SkuTier",
+    "State",
+    "StorageAccountExpand",
+    "TriggerType",
+    "UsageUnit",
+]
+__all__.extend([p for p in _patch_all if p not in __all__])  # pyright: ignore
+_patch_sdk()
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/models/_models_py3.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/models/_models_py3.py
new file mode 100644
index 000000000000..c05c889fbaa4
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/models/_models_py3.py
@@ -0,0 +1,10308 @@
+# 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.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+
+import datetime
+from typing import Any, Dict, List, Literal, Optional, TYPE_CHECKING, Union
+
+from ... import _serialization
+
+if TYPE_CHECKING:
+    from .. import models as _models
+
+
+class AccessPolicy(_serialization.Model):
+    """AccessPolicy.
+
+    :ivar start_time: Start time of the access policy.
+    :vartype start_time: ~datetime.datetime
+    :ivar expiry_time: Expiry time of the access policy.
+    :vartype expiry_time: ~datetime.datetime
+    :ivar permission: List of abbreviated permissions.
+    :vartype permission: str
+    """
+
+    _attribute_map = {
+        "start_time": {"key": "startTime", "type": "iso-8601"},
+        "expiry_time": {"key": "expiryTime", "type": "iso-8601"},
+        "permission": {"key": "permission", "type": "str"},
+    }
+
+    def __init__(
+        self,
+        *,
+        start_time: Optional[datetime.datetime] = None,
+        expiry_time: Optional[datetime.datetime] = None,
+        permission: Optional[str] = None,
+        **kwargs: Any
+    ) -> None:
+        """
+        :keyword start_time: Start time of the access policy.
+        :paramtype start_time: ~datetime.datetime
+        :keyword expiry_time: Expiry time of the access policy.
+        :paramtype expiry_time: ~datetime.datetime
+        :keyword permission: List of abbreviated permissions.
+        :paramtype permission: str
+        """
+        super().__init__(**kwargs)
+        self.start_time = start_time
+        self.expiry_time = expiry_time
+        self.permission = permission
+
+
+class AccountImmutabilityPolicyProperties(_serialization.Model):
+    """This defines account-level immutability policy properties.
+
+    :ivar immutability_period_since_creation_in_days: The immutability period for the blobs in the
+     container since the policy creation, in days.
+    :vartype immutability_period_since_creation_in_days: int
+    :ivar state: The ImmutabilityPolicy state defines the mode of the policy. Disabled state
+     disables the policy, Unlocked state allows increase and decrease of immutability retention time
+     and also allows toggling allowProtectedAppendWrites property, Locked state only allows the
+     increase of the immutability retention time. A policy can only be created in a Disabled or
+     Unlocked state and can be toggled between the two states. Only a policy in an Unlocked state
+     can transition to a Locked state which cannot be reverted. Known values are: "Unlocked",
+     "Locked", and "Disabled".
+    :vartype state: str or ~azure.mgmt.storage.v2024_01_01.models.AccountImmutabilityPolicyState
+    :ivar allow_protected_append_writes: This property can only be changed for disabled and
+     unlocked time-based retention policies. When enabled, new blocks can be written to an append
+     blob while maintaining immutability protection and compliance. Only new blocks can be added and
+     any existing blocks cannot be modified or deleted.
+    :vartype allow_protected_append_writes: bool
+    """
+
+    _validation = {
+        "immutability_period_since_creation_in_days": {"maximum": 146000, "minimum": 1},
+    }
+
+    _attribute_map = {
+        "immutability_period_since_creation_in_days": {"key": "immutabilityPeriodSinceCreationInDays", "type": "int"},
+        "state": {"key": "state", "type": "str"},
+        "allow_protected_append_writes": {"key": "allowProtectedAppendWrites", "type": "bool"},
+    }
+
+    def __init__(
+        self,
+        *,
+        immutability_period_since_creation_in_days: Optional[int] = None,
+        state: Optional[Union[str, "_models.AccountImmutabilityPolicyState"]] = None,
+        allow_protected_append_writes: Optional[bool] = None,
+        **kwargs: Any
+    ) -> None:
+        """
+        :keyword immutability_period_since_creation_in_days: The immutability period for the blobs in
+         the container since the policy creation, in days.
+        :paramtype immutability_period_since_creation_in_days: int
+        :keyword state: The ImmutabilityPolicy state defines the mode of the policy. Disabled state
+         disables the policy, Unlocked state allows increase and decrease of immutability retention time
+         and also allows toggling allowProtectedAppendWrites property, Locked state only allows the
+         increase of the immutability retention time. A policy can only be created in a Disabled or
+         Unlocked state and can be toggled between the two states. Only a policy in an Unlocked state
+         can transition to a Locked state which cannot be reverted. Known values are: "Unlocked",
+         "Locked", and "Disabled".
+        :paramtype state: str or ~azure.mgmt.storage.v2024_01_01.models.AccountImmutabilityPolicyState
+        :keyword allow_protected_append_writes: This property can only be changed for disabled and
+         unlocked time-based retention policies. When enabled, new blocks can be written to an append
+         blob while maintaining immutability protection and compliance. Only new blocks can be added and
+         any existing blocks cannot be modified or deleted.
+        :paramtype allow_protected_append_writes: bool
+        """
+        super().__init__(**kwargs)
+        self.immutability_period_since_creation_in_days = immutability_period_since_creation_in_days
+        self.state = state
+        self.allow_protected_append_writes = allow_protected_append_writes
+
+
+class AccountLimits(_serialization.Model):
+    """Maximum provisioned storage, IOPS, bandwidth and number of file shares limits for the storage
+    account.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar max_file_shares: The maximum number of file shares limit for the storage account.
+    :vartype max_file_shares: int
+    :ivar max_provisioned_storage_gi_b: The maximum provisioned storage quota limit in gibibytes
+     for the storage account.
+    :vartype max_provisioned_storage_gi_b: int
+    :ivar max_provisioned_iops: The maximum provisioned IOPS limit for the storage account.
+    :vartype max_provisioned_iops: int
+    :ivar max_provisioned_bandwidth_mi_b_per_sec: The maximum provisioned bandwidth limit in
+     mebibytes per second for the storage account.
+    :vartype max_provisioned_bandwidth_mi_b_per_sec: int
+    """
+
+    _validation = {
+        "max_file_shares": {"readonly": True},
+        "max_provisioned_storage_gi_b": {"readonly": True},
+        "max_provisioned_iops": {"readonly": True},
+        "max_provisioned_bandwidth_mi_b_per_sec": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "max_file_shares": {"key": "maxFileShares", "type": "int"},
+        "max_provisioned_storage_gi_b": {"key": "maxProvisionedStorageGiB", "type": "int"},
+        "max_provisioned_iops": {"key": "maxProvisionedIOPS", "type": "int"},
+        "max_provisioned_bandwidth_mi_b_per_sec": {"key": "maxProvisionedBandwidthMiBPerSec", "type": "int"},
+    }
+
+    def __init__(self, **kwargs: Any) -> None:
+        """ """
+        super().__init__(**kwargs)
+        self.max_file_shares = None
+        self.max_provisioned_storage_gi_b = None
+        self.max_provisioned_iops = None
+        self.max_provisioned_bandwidth_mi_b_per_sec = None
+
+
+class AccountSasParameters(_serialization.Model):
+    """The parameters to list SAS credentials of a storage account.
+
+    All required parameters must be populated in order to send to server.
+
+    :ivar services: The signed services accessible with the account SAS. Possible values include:
+     Blob (b), Queue (q), Table (t), File (f). Required. Known values are: "b", "q", "t", and "f".
+    :vartype services: str or ~azure.mgmt.storage.v2024_01_01.models.Services
+    :ivar resource_types: The signed resource types that are accessible with the account SAS.
+     Service (s): Access to service-level APIs; Container (c): Access to container-level APIs;
+     Object (o): Access to object-level APIs for blobs, queue messages, table entities, and files.
+     Required. Known values are: "s", "c", and "o".
+    :vartype resource_types: str or ~azure.mgmt.storage.v2024_01_01.models.SignedResourceTypes
+    :ivar permissions: The signed permissions for the account SAS. Possible values include: Read
+     (r), Write (w), Delete (d), List (l), Add (a), Create (c), Update (u) and Process (p).
+     Required. Known values are: "r", "d", "w", "l", "a", "c", "u", and "p".
+    :vartype permissions: str or ~azure.mgmt.storage.v2024_01_01.models.Permissions
+    :ivar ip_address_or_range: An IP address or a range of IP addresses from which to accept
+     requests.
+    :vartype ip_address_or_range: str
+    :ivar protocols: The protocol permitted for a request made with the account SAS. Known values
+     are: "https,http" and "https".
+    :vartype protocols: str or ~azure.mgmt.storage.v2024_01_01.models.HttpProtocol
+    :ivar shared_access_start_time: The time at which the SAS becomes valid.
+    :vartype shared_access_start_time: ~datetime.datetime
+    :ivar shared_access_expiry_time: The time at which the shared access signature becomes invalid.
+     Required.
+    :vartype shared_access_expiry_time: ~datetime.datetime
+    :ivar key_to_sign: The key to sign the account SAS token with.
+    :vartype key_to_sign: str
+    """
+
+    _validation = {
+        "services": {"required": True},
+        "resource_types": {"required": True},
+        "permissions": {"required": True},
+        "shared_access_expiry_time": {"required": True},
+    }
+
+    _attribute_map = {
+        "services": {"key": "signedServices", "type": "str"},
+        "resource_types": {"key": "signedResourceTypes", "type": "str"},
+        "permissions": {"key": "signedPermission", "type": "str"},
+        "ip_address_or_range": {"key": "signedIp", "type": "str"},
+        "protocols": {"key": "signedProtocol", "type": "str"},
+        "shared_access_start_time": {"key": "signedStart", "type": "iso-8601"},
+        "shared_access_expiry_time": {"key": "signedExpiry", "type": "iso-8601"},
+        "key_to_sign": {"key": "keyToSign", "type": "str"},
+    }
+
+    def __init__(
+        self,
+        *,
+        services: Union[str, "_models.Services"],
+        resource_types: Union[str, "_models.SignedResourceTypes"],
+        permissions: Union[str, "_models.Permissions"],
+        shared_access_expiry_time: datetime.datetime,
+        ip_address_or_range: Optional[str] = None,
+        protocols: Optional[Union[str, "_models.HttpProtocol"]] = None,
+        shared_access_start_time: Optional[datetime.datetime] = None,
+        key_to_sign: Optional[str] = None,
+        **kwargs: Any
+    ) -> None:
+        """
+        :keyword services: The signed services accessible with the account SAS. Possible values
+         include: Blob (b), Queue (q), Table (t), File (f). Required. Known values are: "b", "q", "t",
+         and "f".
+        :paramtype services: str or ~azure.mgmt.storage.v2024_01_01.models.Services
+        :keyword resource_types: The signed resource types that are accessible with the account SAS.
+         Service (s): Access to service-level APIs; Container (c): Access to container-level APIs;
+         Object (o): Access to object-level APIs for blobs, queue messages, table entities, and files.
+         Required. Known values are: "s", "c", and "o".
+        :paramtype resource_types: str or ~azure.mgmt.storage.v2024_01_01.models.SignedResourceTypes
+        :keyword permissions: The signed permissions for the account SAS. Possible values include: Read
+         (r), Write (w), Delete (d), List (l), Add (a), Create (c), Update (u) and Process (p).
+         Required. Known values are: "r", "d", "w", "l", "a", "c", "u", and "p".
+        :paramtype permissions: str or ~azure.mgmt.storage.v2024_01_01.models.Permissions
+        :keyword ip_address_or_range: An IP address or a range of IP addresses from which to accept
+         requests.
+        :paramtype ip_address_or_range: str
+        :keyword protocols: The protocol permitted for a request made with the account SAS. Known
+         values are: "https,http" and "https".
+        :paramtype protocols: str or ~azure.mgmt.storage.v2024_01_01.models.HttpProtocol
+        :keyword shared_access_start_time: The time at which the SAS becomes valid.
+        :paramtype shared_access_start_time: ~datetime.datetime
+        :keyword shared_access_expiry_time: The time at which the shared access signature becomes
+         invalid. Required.
+        :paramtype shared_access_expiry_time: ~datetime.datetime
+        :keyword key_to_sign: The key to sign the account SAS token with.
+        :paramtype key_to_sign: str
+        """
+        super().__init__(**kwargs)
+        self.services = services
+        self.resource_types = resource_types
+        self.permissions = permissions
+        self.ip_address_or_range = ip_address_or_range
+        self.protocols = protocols
+        self.shared_access_start_time = shared_access_start_time
+        self.shared_access_expiry_time = shared_access_expiry_time
+        self.key_to_sign = key_to_sign
+
+
+class AccountUsage(_serialization.Model):
+    """Usage of provisioned storage, IOPS, bandwidth and number of file shares across all live shares
+    and soft-deleted shares in the account.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar live_shares: Usage of provisioned storage, IOPS, bandwidth and number of file shares
+     across all live shares or soft-deleted shares in the account.
+    :vartype live_shares: ~azure.mgmt.storage.v2024_01_01.models.AccountUsageElements
+    :ivar soft_deleted_shares: Usage of provisioned storage, IOPS, bandwidth and number of file
+     shares across all live shares or soft-deleted shares in the account.
+    :vartype soft_deleted_shares: ~azure.mgmt.storage.v2024_01_01.models.AccountUsageElements
+    """
+
+    _validation = {
+        "live_shares": {"readonly": True},
+        "soft_deleted_shares": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "live_shares": {"key": "liveShares", "type": "AccountUsageElements"},
+        "soft_deleted_shares": {"key": "softDeletedShares", "type": "AccountUsageElements"},
+    }
+
+    def __init__(self, **kwargs: Any) -> None:
+        """ """
+        super().__init__(**kwargs)
+        self.live_shares = None
+        self.soft_deleted_shares = None
+
+
+class AccountUsageElements(_serialization.Model):
+    """Usage of provisioned storage, IOPS, bandwidth and number of file shares across all live shares
+    or soft-deleted shares in the account.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar file_share_count: The total number of file shares.
+    :vartype file_share_count: int
+    :ivar provisioned_storage_gi_b: The total provisioned storage quota in gibibytes.
+    :vartype provisioned_storage_gi_b: int
+    :ivar provisioned_iops: The total provisioned IOPS.
+    :vartype provisioned_iops: int
+    :ivar provisioned_bandwidth_mi_b_per_sec: The total provisioned bandwidth in mebibytes per
+     second.
+    :vartype provisioned_bandwidth_mi_b_per_sec: int
+    """
+
+    _validation = {
+        "file_share_count": {"readonly": True},
+        "provisioned_storage_gi_b": {"readonly": True},
+        "provisioned_iops": {"readonly": True},
+        "provisioned_bandwidth_mi_b_per_sec": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "file_share_count": {"key": "fileShareCount", "type": "int"},
+        "provisioned_storage_gi_b": {"key": "provisionedStorageGiB", "type": "int"},
+        "provisioned_iops": {"key": "provisionedIOPS", "type": "int"},
+        "provisioned_bandwidth_mi_b_per_sec": {"key": "provisionedBandwidthMiBPerSec", "type": "int"},
+    }
+
+    def __init__(self, **kwargs: Any) -> None:
+        """ """
+        super().__init__(**kwargs)
+        self.file_share_count = None
+        self.provisioned_storage_gi_b = None
+        self.provisioned_iops = None
+        self.provisioned_bandwidth_mi_b_per_sec = None
+
+
+class ActiveDirectoryProperties(_serialization.Model):
+    """Settings properties for Active Directory (AD).
+
+    All required parameters must be populated in order to send to server.
+
+    :ivar domain_name: Specifies the primary domain that the AD DNS server is authoritative for.
+     Required.
+    :vartype domain_name: str
+    :ivar net_bios_domain_name: Specifies the NetBIOS domain name.
+    :vartype net_bios_domain_name: str
+    :ivar forest_name: Specifies the Active Directory forest to get.
+    :vartype forest_name: str
+    :ivar domain_guid: Specifies the domain GUID. Required.
+    :vartype domain_guid: str
+    :ivar domain_sid: Specifies the security identifier (SID).
+    :vartype domain_sid: str
+    :ivar azure_storage_sid: Specifies the security identifier (SID) for Azure Storage.
+    :vartype azure_storage_sid: str
+    :ivar sam_account_name: Specifies the Active Directory SAMAccountName for Azure Storage.
+    :vartype sam_account_name: str
+    :ivar account_type: Specifies the Active Directory account type for Azure Storage. Known values
+     are: "User" and "Computer".
+    :vartype account_type: str or ~azure.mgmt.storage.v2024_01_01.models.AccountType
+    """
+
+    _validation = {
+        "domain_name": {"required": True},
+        "domain_guid": {"required": True},
+    }
+
+    _attribute_map = {
+        "domain_name": {"key": "domainName", "type": "str"},
+        "net_bios_domain_name": {"key": "netBiosDomainName", "type": "str"},
+        "forest_name": {"key": "forestName", "type": "str"},
+        "domain_guid": {"key": "domainGuid", "type": "str"},
+        "domain_sid": {"key": "domainSid", "type": "str"},
+        "azure_storage_sid": {"key": "azureStorageSid", "type": "str"},
+        "sam_account_name": {"key": "samAccountName", "type": "str"},
+        "account_type": {"key": "accountType", "type": "str"},
+    }
+
+    def __init__(
+        self,
+        *,
+        domain_name: str,
+        domain_guid: str,
+        net_bios_domain_name: Optional[str] = None,
+        forest_name: Optional[str] = None,
+        domain_sid: Optional[str] = None,
+        azure_storage_sid: Optional[str] = None,
+        sam_account_name: Optional[str] = None,
+        account_type: Optional[Union[str, "_models.AccountType"]] = None,
+        **kwargs: Any
+    ) -> None:
+        """
+        :keyword domain_name: Specifies the primary domain that the AD DNS server is authoritative for.
+         Required.
+        :paramtype domain_name: str
+        :keyword net_bios_domain_name: Specifies the NetBIOS domain name.
+        :paramtype net_bios_domain_name: str
+        :keyword forest_name: Specifies the Active Directory forest to get.
+        :paramtype forest_name: str
+        :keyword domain_guid: Specifies the domain GUID. Required.
+        :paramtype domain_guid: str
+        :keyword domain_sid: Specifies the security identifier (SID).
+        :paramtype domain_sid: str
+        :keyword azure_storage_sid: Specifies the security identifier (SID) for Azure Storage.
+        :paramtype azure_storage_sid: str
+        :keyword sam_account_name: Specifies the Active Directory SAMAccountName for Azure Storage.
+        :paramtype sam_account_name: str
+        :keyword account_type: Specifies the Active Directory account type for Azure Storage. Known
+         values are: "User" and "Computer".
+        :paramtype account_type: str or ~azure.mgmt.storage.v2024_01_01.models.AccountType
+        """
+        super().__init__(**kwargs)
+        self.domain_name = domain_name
+        self.net_bios_domain_name = net_bios_domain_name
+        self.forest_name = forest_name
+        self.domain_guid = domain_guid
+        self.domain_sid = domain_sid
+        self.azure_storage_sid = azure_storage_sid
+        self.sam_account_name = sam_account_name
+        self.account_type = account_type
+
+
+class Resource(_serialization.Model):
+    """Common fields that are returned in the response for all Azure Resource Manager resources.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar id: Fully qualified resource ID for the resource. Ex -
+     /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}.  # pylint: disable=line-too-long
+    :vartype id: str
+    :ivar name: The name of the resource.
+    :vartype name: str
+    :ivar type: The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or
+     "Microsoft.Storage/storageAccounts".
+    :vartype type: str
+    """
+
+    _validation = {
+        "id": {"readonly": True},
+        "name": {"readonly": True},
+        "type": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "id": {"key": "id", "type": "str"},
+        "name": {"key": "name", "type": "str"},
+        "type": {"key": "type", "type": "str"},
+    }
+
+    def __init__(self, **kwargs: Any) -> None:
+        """ """
+        super().__init__(**kwargs)
+        self.id = None
+        self.name = None
+        self.type = None
+
+
+class AzureEntityResource(Resource):
+    """The resource model definition for an Azure Resource Manager resource with an etag.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar id: Fully qualified resource ID for the resource. Ex -
+     /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}.  # pylint: disable=line-too-long
+    :vartype id: str
+    :ivar name: The name of the resource.
+    :vartype name: str
+    :ivar type: The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or
+     "Microsoft.Storage/storageAccounts".
+    :vartype type: str
+    :ivar etag: Resource Etag.
+    :vartype etag: str
+    """
+
+    _validation = {
+        "id": {"readonly": True},
+        "name": {"readonly": True},
+        "type": {"readonly": True},
+        "etag": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "id": {"key": "id", "type": "str"},
+        "name": {"key": "name", "type": "str"},
+        "type": {"key": "type", "type": "str"},
+        "etag": {"key": "etag", "type": "str"},
+    }
+
+    def __init__(self, **kwargs: Any) -> None:
+        """ """
+        super().__init__(**kwargs)
+        self.etag = None
+
+
+class AzureFilesIdentityBasedAuthentication(_serialization.Model):
+    """Settings for Azure Files identity based authentication.
+
+    All required parameters must be populated in order to send to server.
+
+    :ivar directory_service_options: Indicates the directory service used. Note that this enum may
+     be extended in the future. Required. Known values are: "None", "AADDS", "AD", and "AADKERB".
+    :vartype directory_service_options: str or
+     ~azure.mgmt.storage.v2024_01_01.models.DirectoryServiceOptions
+    :ivar active_directory_properties: Required if directoryServiceOptions are AD, optional if they
+     are AADKERB.
+    :vartype active_directory_properties:
+     ~azure.mgmt.storage.v2024_01_01.models.ActiveDirectoryProperties
+    :ivar default_share_permission: Default share permission for users using Kerberos
+     authentication if RBAC role is not assigned. Known values are: "None",
+     "StorageFileDataSmbShareReader", "StorageFileDataSmbShareContributor", and
+     "StorageFileDataSmbShareElevatedContributor".
+    :vartype default_share_permission: str or
+     ~azure.mgmt.storage.v2024_01_01.models.DefaultSharePermission
+    """
+
+    _validation = {
+        "directory_service_options": {"required": True},
+    }
+
+    _attribute_map = {
+        "directory_service_options": {"key": "directoryServiceOptions", "type": "str"},
+        "active_directory_properties": {"key": "activeDirectoryProperties", "type": "ActiveDirectoryProperties"},
+        "default_share_permission": {"key": "defaultSharePermission", "type": "str"},
+    }
+
+    def __init__(
+        self,
+        *,
+        directory_service_options: Union[str, "_models.DirectoryServiceOptions"],
+        active_directory_properties: Optional["_models.ActiveDirectoryProperties"] = None,
+        default_share_permission: Optional[Union[str, "_models.DefaultSharePermission"]] = None,
+        **kwargs: Any
+    ) -> None:
+        """
+        :keyword directory_service_options: Indicates the directory service used. Note that this enum
+         may be extended in the future. Required. Known values are: "None", "AADDS", "AD", and
+         "AADKERB".
+        :paramtype directory_service_options: str or
+         ~azure.mgmt.storage.v2024_01_01.models.DirectoryServiceOptions
+        :keyword active_directory_properties: Required if directoryServiceOptions are AD, optional if
+         they are AADKERB.
+        :paramtype active_directory_properties:
+         ~azure.mgmt.storage.v2024_01_01.models.ActiveDirectoryProperties
+        :keyword default_share_permission: Default share permission for users using Kerberos
+         authentication if RBAC role is not assigned. Known values are: "None",
+         "StorageFileDataSmbShareReader", "StorageFileDataSmbShareContributor", and
+         "StorageFileDataSmbShareElevatedContributor".
+        :paramtype default_share_permission: str or
+         ~azure.mgmt.storage.v2024_01_01.models.DefaultSharePermission
+        """
+        super().__init__(**kwargs)
+        self.directory_service_options = directory_service_options
+        self.active_directory_properties = active_directory_properties
+        self.default_share_permission = default_share_permission
+
+
+class BlobContainer(AzureEntityResource):
+    """Properties of the blob container, including Id, resource name, resource type, Etag.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar id: Fully qualified resource ID for the resource. Ex -
+     /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}.  # pylint: disable=line-too-long
+    :vartype id: str
+    :ivar name: The name of the resource.
+    :vartype name: str
+    :ivar type: The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or
+     "Microsoft.Storage/storageAccounts".
+    :vartype type: str
+    :ivar etag: Resource Etag.
+    :vartype etag: str
+    :ivar version: The version of the deleted blob container.
+    :vartype version: str
+    :ivar deleted: Indicates whether the blob container was deleted.
+    :vartype deleted: bool
+    :ivar deleted_time: Blob container deletion time.
+    :vartype deleted_time: ~datetime.datetime
+    :ivar remaining_retention_days: Remaining retention days for soft deleted blob container.
+    :vartype remaining_retention_days: int
+    :ivar default_encryption_scope: Default the container to use specified encryption scope for all
+     writes.
+    :vartype default_encryption_scope: str
+    :ivar deny_encryption_scope_override: Block override of encryption scope from the container
+     default.
+    :vartype deny_encryption_scope_override: bool
+    :ivar public_access: Specifies whether data in the container may be accessed publicly and the
+     level of access. Known values are: "Container", "Blob", and "None".
+    :vartype public_access: str or ~azure.mgmt.storage.v2024_01_01.models.PublicAccess
+    :ivar last_modified_time: Returns the date and time the container was last modified.
+    :vartype last_modified_time: ~datetime.datetime
+    :ivar lease_status: The lease status of the container. Known values are: "Locked" and
+     "Unlocked".
+    :vartype lease_status: str or ~azure.mgmt.storage.v2024_01_01.models.LeaseStatus
+    :ivar lease_state: Lease state of the container. Known values are: "Available", "Leased",
+     "Expired", "Breaking", and "Broken".
+    :vartype lease_state: str or ~azure.mgmt.storage.v2024_01_01.models.LeaseState
+    :ivar lease_duration: Specifies whether the lease on a container is of infinite or fixed
+     duration, only when the container is leased. Known values are: "Infinite" and "Fixed".
+    :vartype lease_duration: str or ~azure.mgmt.storage.v2024_01_01.models.LeaseDuration
+    :ivar metadata: A name-value pair to associate with the container as metadata.
+    :vartype metadata: dict[str, str]
+    :ivar immutability_policy: The ImmutabilityPolicy property of the container.
+    :vartype immutability_policy:
+     ~azure.mgmt.storage.v2024_01_01.models.ImmutabilityPolicyProperties
+    :ivar legal_hold: The LegalHold property of the container.
+    :vartype legal_hold: ~azure.mgmt.storage.v2024_01_01.models.LegalHoldProperties
+    :ivar has_legal_hold: The hasLegalHold public property is set to true by SRP if there are at
+     least one existing tag. The hasLegalHold public property is set to false by SRP if all existing
+     legal hold tags are cleared out. There can be a maximum of 1000 blob containers with
+     hasLegalHold=true for a given account.
+    :vartype has_legal_hold: bool
+    :ivar has_immutability_policy: The hasImmutabilityPolicy public property is set to true by SRP
+     if ImmutabilityPolicy has been created for this container. The hasImmutabilityPolicy public
+     property is set to false by SRP if ImmutabilityPolicy has not been created for this container.
+    :vartype has_immutability_policy: bool
+    :ivar immutable_storage_with_versioning: The object level immutability property of the
+     container. The property is immutable and can only be set to true at the container creation
+     time. Existing containers must undergo a migration process.
+    :vartype immutable_storage_with_versioning:
+     ~azure.mgmt.storage.v2024_01_01.models.ImmutableStorageWithVersioning
+    :ivar enable_nfs_v3_root_squash: Enable NFSv3 root squash on blob container.
+    :vartype enable_nfs_v3_root_squash: bool
+    :ivar enable_nfs_v3_all_squash: Enable NFSv3 all squash on blob container.
+    :vartype enable_nfs_v3_all_squash: bool
+    """
+
+    _validation = {
+        "id": {"readonly": True},
+        "name": {"readonly": True},
+        "type": {"readonly": True},
+        "etag": {"readonly": True},
+        "version": {"readonly": True},
+        "deleted": {"readonly": True},
+        "deleted_time": {"readonly": True},
+        "remaining_retention_days": {"readonly": True},
+        "last_modified_time": {"readonly": True},
+        "lease_status": {"readonly": True},
+        "lease_state": {"readonly": True},
+        "lease_duration": {"readonly": True},
+        "immutability_policy": {"readonly": True},
+        "legal_hold": {"readonly": True},
+        "has_legal_hold": {"readonly": True},
+        "has_immutability_policy": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "id": {"key": "id", "type": "str"},
+        "name": {"key": "name", "type": "str"},
+        "type": {"key": "type", "type": "str"},
+        "etag": {"key": "etag", "type": "str"},
+        "version": {"key": "properties.version", "type": "str"},
+        "deleted": {"key": "properties.deleted", "type": "bool"},
+        "deleted_time": {"key": "properties.deletedTime", "type": "iso-8601"},
+        "remaining_retention_days": {"key": "properties.remainingRetentionDays", "type": "int"},
+        "default_encryption_scope": {"key": "properties.defaultEncryptionScope", "type": "str"},
+        "deny_encryption_scope_override": {"key": "properties.denyEncryptionScopeOverride", "type": "bool"},
+        "public_access": {"key": "properties.publicAccess", "type": "str"},
+        "last_modified_time": {"key": "properties.lastModifiedTime", "type": "iso-8601"},
+        "lease_status": {"key": "properties.leaseStatus", "type": "str"},
+        "lease_state": {"key": "properties.leaseState", "type": "str"},
+        "lease_duration": {"key": "properties.leaseDuration", "type": "str"},
+        "metadata": {"key": "properties.metadata", "type": "{str}"},
+        "immutability_policy": {"key": "properties.immutabilityPolicy", "type": "ImmutabilityPolicyProperties"},
+        "legal_hold": {"key": "properties.legalHold", "type": "LegalHoldProperties"},
+        "has_legal_hold": {"key": "properties.hasLegalHold", "type": "bool"},
+        "has_immutability_policy": {"key": "properties.hasImmutabilityPolicy", "type": "bool"},
+        "immutable_storage_with_versioning": {
+            "key": "properties.immutableStorageWithVersioning",
+            "type": "ImmutableStorageWithVersioning",
+        },
+        "enable_nfs_v3_root_squash": {"key": "properties.enableNfsV3RootSquash", "type": "bool"},
+        "enable_nfs_v3_all_squash": {"key": "properties.enableNfsV3AllSquash", "type": "bool"},
+    }
+
+    def __init__(
+        self,
+        *,
+        default_encryption_scope: Optional[str] = None,
+        deny_encryption_scope_override: Optional[bool] = None,
+        public_access: Optional[Union[str, "_models.PublicAccess"]] = None,
+        metadata: Optional[Dict[str, str]] = None,
+        immutable_storage_with_versioning: Optional["_models.ImmutableStorageWithVersioning"] = None,
+        enable_nfs_v3_root_squash: Optional[bool] = None,
+        enable_nfs_v3_all_squash: Optional[bool] = None,
+        **kwargs: Any
+    ) -> None:
+        """
+        :keyword default_encryption_scope: Default the container to use specified encryption scope for
+         all writes.
+        :paramtype default_encryption_scope: str
+        :keyword deny_encryption_scope_override: Block override of encryption scope from the container
+         default.
+        :paramtype deny_encryption_scope_override: bool
+        :keyword public_access: Specifies whether data in the container may be accessed publicly and
+         the level of access. Known values are: "Container", "Blob", and "None".
+        :paramtype public_access: str or ~azure.mgmt.storage.v2024_01_01.models.PublicAccess
+        :keyword metadata: A name-value pair to associate with the container as metadata.
+        :paramtype metadata: dict[str, str]
+        :keyword immutable_storage_with_versioning: The object level immutability property of the
+         container. The property is immutable and can only be set to true at the container creation
+         time. Existing containers must undergo a migration process.
+        :paramtype immutable_storage_with_versioning:
+         ~azure.mgmt.storage.v2024_01_01.models.ImmutableStorageWithVersioning
+        :keyword enable_nfs_v3_root_squash: Enable NFSv3 root squash on blob container.
+        :paramtype enable_nfs_v3_root_squash: bool
+        :keyword enable_nfs_v3_all_squash: Enable NFSv3 all squash on blob container.
+        :paramtype enable_nfs_v3_all_squash: bool
+        """
+        super().__init__(**kwargs)
+        self.version = None
+        self.deleted = None
+        self.deleted_time = None
+        self.remaining_retention_days = None
+        self.default_encryption_scope = default_encryption_scope
+        self.deny_encryption_scope_override = deny_encryption_scope_override
+        self.public_access = public_access
+        self.last_modified_time = None
+        self.lease_status = None
+        self.lease_state = None
+        self.lease_duration = None
+        self.metadata = metadata
+        self.immutability_policy = None
+        self.legal_hold = None
+        self.has_legal_hold = None
+        self.has_immutability_policy = None
+        self.immutable_storage_with_versioning = immutable_storage_with_versioning
+        self.enable_nfs_v3_root_squash = enable_nfs_v3_root_squash
+        self.enable_nfs_v3_all_squash = enable_nfs_v3_all_squash
+
+
+class BlobInventoryCreationTime(_serialization.Model):
+    """This property defines the creation time based filtering condition. Blob Inventory schema
+    parameter 'Creation-Time' is mandatory with this filter.
+
+    :ivar last_n_days: When set the policy filters the objects that are created in the last N days.
+     Where N is an integer value between 1 to 36500.
+    :vartype last_n_days: int
+    """
+
+    _validation = {
+        "last_n_days": {"maximum": 36500, "minimum": 1},
+    }
+
+    _attribute_map = {
+        "last_n_days": {"key": "lastNDays", "type": "int"},
+    }
+
+    def __init__(self, *, last_n_days: Optional[int] = None, **kwargs: Any) -> None:
+        """
+        :keyword last_n_days: When set the policy filters the objects that are created in the last N
+         days. Where N is an integer value between 1 to 36500.
+        :paramtype last_n_days: int
+        """
+        super().__init__(**kwargs)
+        self.last_n_days = last_n_days
+
+
+class BlobInventoryPolicy(Resource):
+    """The storage account blob inventory policy.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar id: Fully qualified resource ID for the resource. Ex -
+     /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}.  # pylint: disable=line-too-long
+    :vartype id: str
+    :ivar name: The name of the resource.
+    :vartype name: str
+    :ivar type: The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or
+     "Microsoft.Storage/storageAccounts".
+    :vartype type: str
+    :ivar system_data: Metadata pertaining to creation and last modification of the resource.
+    :vartype system_data: ~azure.mgmt.storage.v2024_01_01.models.SystemData
+    :ivar last_modified_time: Returns the last modified date and time of the blob inventory policy.
+    :vartype last_modified_time: ~datetime.datetime
+    :ivar policy: The storage account blob inventory policy object. It is composed of policy rules.
+    :vartype policy: ~azure.mgmt.storage.v2024_01_01.models.BlobInventoryPolicySchema
+    """
+
+    _validation = {
+        "id": {"readonly": True},
+        "name": {"readonly": True},
+        "type": {"readonly": True},
+        "system_data": {"readonly": True},
+        "last_modified_time": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "id": {"key": "id", "type": "str"},
+        "name": {"key": "name", "type": "str"},
+        "type": {"key": "type", "type": "str"},
+        "system_data": {"key": "systemData", "type": "SystemData"},
+        "last_modified_time": {"key": "properties.lastModifiedTime", "type": "iso-8601"},
+        "policy": {"key": "properties.policy", "type": "BlobInventoryPolicySchema"},
+    }
+
+    def __init__(self, *, policy: Optional["_models.BlobInventoryPolicySchema"] = None, **kwargs: Any) -> None:
+        """
+        :keyword policy: The storage account blob inventory policy object. It is composed of policy
+         rules.
+        :paramtype policy: ~azure.mgmt.storage.v2024_01_01.models.BlobInventoryPolicySchema
+        """
+        super().__init__(**kwargs)
+        self.system_data = None
+        self.last_modified_time = None
+        self.policy = policy
+
+
+class BlobInventoryPolicyDefinition(_serialization.Model):
+    """An object that defines the blob inventory rule.
+
+    All required parameters must be populated in order to send to server.
+
+    :ivar filters: An object that defines the filter set.
+    :vartype filters: ~azure.mgmt.storage.v2024_01_01.models.BlobInventoryPolicyFilter
+    :ivar format: This is a required field, it specifies the format for the inventory files.
+     Required. Known values are: "Csv" and "Parquet".
+    :vartype format: str or ~azure.mgmt.storage.v2024_01_01.models.Format
+    :ivar schedule: This is a required field. This field is used to schedule an inventory
+     formation. Required. Known values are: "Daily" and "Weekly".
+    :vartype schedule: str or ~azure.mgmt.storage.v2024_01_01.models.Schedule
+    :ivar object_type: This is a required field. This field specifies the scope of the inventory
+     created either at the blob or container level. Required. Known values are: "Blob" and
+     "Container".
+    :vartype object_type: str or ~azure.mgmt.storage.v2024_01_01.models.ObjectType
+    :ivar schema_fields: This is a required field. This field specifies the fields and properties
+     of the object to be included in the inventory. The Schema field value 'Name' is always
+     required. The valid values for this field for the 'Blob' definition.objectType include 'Name,
+     Creation-Time, Last-Modified, Content-Length, Content-MD5, BlobType, AccessTier,
+     AccessTierChangeTime, AccessTierInferred, Tags, Expiry-Time, hdi_isfolder, Owner, Group,
+     Permissions, Acl, Snapshot, VersionId, IsCurrentVersion, Metadata, LastAccessTime, Tags, Etag,
+     ContentType, ContentEncoding, ContentLanguage, ContentCRC64, CacheControl, ContentDisposition,
+     LeaseStatus, LeaseState, LeaseDuration, ServerEncrypted, Deleted, DeletionId, DeletedTime,
+     RemainingRetentionDays, ImmutabilityPolicyUntilDate, ImmutabilityPolicyMode, LegalHold, CopyId,
+     CopyStatus, CopySource, CopyProgress, CopyCompletionTime, CopyStatusDescription,
+     CustomerProvidedKeySha256, RehydratePriority, ArchiveStatus, XmsBlobSequenceNumber,
+     EncryptionScope, IncrementalCopy, TagCount'. For Blob object type schema field value
+     'DeletedTime' is applicable only for Hns enabled accounts. The valid values for 'Container'
+     definition.objectType include 'Name, Last-Modified, Metadata, LeaseStatus, LeaseState,
+     LeaseDuration, PublicAccess, HasImmutabilityPolicy, HasLegalHold, Etag, DefaultEncryptionScope,
+     DenyEncryptionScopeOverride, ImmutableStorageWithVersioningEnabled, Deleted, Version,
+     DeletedTime, RemainingRetentionDays'. Schema field values 'Expiry-Time, hdi_isfolder, Owner,
+     Group, Permissions, Acl, DeletionId' are valid only for Hns enabled accounts.Schema field
+     values 'Tags, TagCount' are only valid for Non-Hns accounts. Required.
+    :vartype schema_fields: list[str]
+    """
+
+    _validation = {
+        "format": {"required": True},
+        "schedule": {"required": True},
+        "object_type": {"required": True},
+        "schema_fields": {"required": True},
+    }
+
+    _attribute_map = {
+        "filters": {"key": "filters", "type": "BlobInventoryPolicyFilter"},
+        "format": {"key": "format", "type": "str"},
+        "schedule": {"key": "schedule", "type": "str"},
+        "object_type": {"key": "objectType", "type": "str"},
+        "schema_fields": {"key": "schemaFields", "type": "[str]"},
+    }
+
+    def __init__(
+        self,
+        *,
+        format: Union[str, "_models.Format"],
+        schedule: Union[str, "_models.Schedule"],
+        object_type: Union[str, "_models.ObjectType"],
+        schema_fields: List[str],
+        filters: Optional["_models.BlobInventoryPolicyFilter"] = None,
+        **kwargs: Any
+    ) -> None:
+        """
+        :keyword filters: An object that defines the filter set.
+        :paramtype filters: ~azure.mgmt.storage.v2024_01_01.models.BlobInventoryPolicyFilter
+        :keyword format: This is a required field, it specifies the format for the inventory files.
+         Required. Known values are: "Csv" and "Parquet".
+        :paramtype format: str or ~azure.mgmt.storage.v2024_01_01.models.Format
+        :keyword schedule: This is a required field. This field is used to schedule an inventory
+         formation. Required. Known values are: "Daily" and "Weekly".
+        :paramtype schedule: str or ~azure.mgmt.storage.v2024_01_01.models.Schedule
+        :keyword object_type: This is a required field. This field specifies the scope of the inventory
+         created either at the blob or container level. Required. Known values are: "Blob" and
+         "Container".
+        :paramtype object_type: str or ~azure.mgmt.storage.v2024_01_01.models.ObjectType
+        :keyword schema_fields: This is a required field. This field specifies the fields and
+         properties of the object to be included in the inventory. The Schema field value 'Name' is
+         always required. The valid values for this field for the 'Blob' definition.objectType include
+         'Name, Creation-Time, Last-Modified, Content-Length, Content-MD5, BlobType, AccessTier,
+         AccessTierChangeTime, AccessTierInferred, Tags, Expiry-Time, hdi_isfolder, Owner, Group,
+         Permissions, Acl, Snapshot, VersionId, IsCurrentVersion, Metadata, LastAccessTime, Tags, Etag,
+         ContentType, ContentEncoding, ContentLanguage, ContentCRC64, CacheControl, ContentDisposition,
+         LeaseStatus, LeaseState, LeaseDuration, ServerEncrypted, Deleted, DeletionId, DeletedTime,
+         RemainingRetentionDays, ImmutabilityPolicyUntilDate, ImmutabilityPolicyMode, LegalHold, CopyId,
+         CopyStatus, CopySource, CopyProgress, CopyCompletionTime, CopyStatusDescription,
+         CustomerProvidedKeySha256, RehydratePriority, ArchiveStatus, XmsBlobSequenceNumber,
+         EncryptionScope, IncrementalCopy, TagCount'. For Blob object type schema field value
+         'DeletedTime' is applicable only for Hns enabled accounts. The valid values for 'Container'
+         definition.objectType include 'Name, Last-Modified, Metadata, LeaseStatus, LeaseState,
+         LeaseDuration, PublicAccess, HasImmutabilityPolicy, HasLegalHold, Etag, DefaultEncryptionScope,
+         DenyEncryptionScopeOverride, ImmutableStorageWithVersioningEnabled, Deleted, Version,
+         DeletedTime, RemainingRetentionDays'. Schema field values 'Expiry-Time, hdi_isfolder, Owner,
+         Group, Permissions, Acl, DeletionId' are valid only for Hns enabled accounts.Schema field
+         values 'Tags, TagCount' are only valid for Non-Hns accounts. Required.
+        :paramtype schema_fields: list[str]
+        """
+        super().__init__(**kwargs)
+        self.filters = filters
+        self.format = format
+        self.schedule = schedule
+        self.object_type = object_type
+        self.schema_fields = schema_fields
+
+
+class BlobInventoryPolicyFilter(_serialization.Model):
+    """An object that defines the blob inventory rule filter conditions. For 'Blob'
+    definition.objectType all filter properties are applicable, 'blobTypes' is required and others
+    are optional. For 'Container' definition.objectType only prefixMatch is applicable and is
+    optional.
+
+    :ivar prefix_match: An array of strings with maximum 10 blob prefixes to be included in the
+     inventory.
+    :vartype prefix_match: list[str]
+    :ivar exclude_prefix: An array of strings with maximum 10 blob prefixes to be excluded from the
+     inventory.
+    :vartype exclude_prefix: list[str]
+    :ivar blob_types: An array of predefined enum values. Valid values include blockBlob,
+     appendBlob, pageBlob. Hns accounts does not support pageBlobs. This field is required when
+     definition.objectType property is set to 'Blob'.
+    :vartype blob_types: list[str]
+    :ivar include_blob_versions: Includes blob versions in blob inventory when value is set to
+     true. The definition.schemaFields values 'VersionId and IsCurrentVersion' are required if this
+     property is set to true, else they must be excluded.
+    :vartype include_blob_versions: bool
+    :ivar include_snapshots: Includes blob snapshots in blob inventory when value is set to true.
+     The definition.schemaFields value 'Snapshot' is required if this property is set to true, else
+     it must be excluded.
+    :vartype include_snapshots: bool
+    :ivar include_deleted: For 'Container' definition.objectType the definition.schemaFields must
+     include 'Deleted, Version, DeletedTime and RemainingRetentionDays'. For 'Blob'
+     definition.objectType and HNS enabled storage accounts the definition.schemaFields must include
+     'DeletionId, Deleted, DeletedTime and RemainingRetentionDays' and for Hns disabled accounts the
+     definition.schemaFields must include 'Deleted and RemainingRetentionDays', else it must be
+     excluded.
+    :vartype include_deleted: bool
+    :ivar creation_time: This property is used to filter objects based on the object creation time.
+    :vartype creation_time: ~azure.mgmt.storage.v2024_01_01.models.BlobInventoryCreationTime
+    """
+
+    _attribute_map = {
+        "prefix_match": {"key": "prefixMatch", "type": "[str]"},
+        "exclude_prefix": {"key": "excludePrefix", "type": "[str]"},
+        "blob_types": {"key": "blobTypes", "type": "[str]"},
+        "include_blob_versions": {"key": "includeBlobVersions", "type": "bool"},
+        "include_snapshots": {"key": "includeSnapshots", "type": "bool"},
+        "include_deleted": {"key": "includeDeleted", "type": "bool"},
+        "creation_time": {"key": "creationTime", "type": "BlobInventoryCreationTime"},
+    }
+
+    def __init__(
+        self,
+        *,
+        prefix_match: Optional[List[str]] = None,
+        exclude_prefix: Optional[List[str]] = None,
+        blob_types: Optional[List[str]] = None,
+        include_blob_versions: Optional[bool] = None,
+        include_snapshots: Optional[bool] = None,
+        include_deleted: Optional[bool] = None,
+        creation_time: Optional["_models.BlobInventoryCreationTime"] = None,
+        **kwargs: Any
+    ) -> None:
+        """
+        :keyword prefix_match: An array of strings with maximum 10 blob prefixes to be included in the
+         inventory.
+        :paramtype prefix_match: list[str]
+        :keyword exclude_prefix: An array of strings with maximum 10 blob prefixes to be excluded from
+         the inventory.
+        :paramtype exclude_prefix: list[str]
+        :keyword blob_types: An array of predefined enum values. Valid values include blockBlob,
+         appendBlob, pageBlob. Hns accounts does not support pageBlobs. This field is required when
+         definition.objectType property is set to 'Blob'.
+        :paramtype blob_types: list[str]
+        :keyword include_blob_versions: Includes blob versions in blob inventory when value is set to
+         true. The definition.schemaFields values 'VersionId and IsCurrentVersion' are required if this
+         property is set to true, else they must be excluded.
+        :paramtype include_blob_versions: bool
+        :keyword include_snapshots: Includes blob snapshots in blob inventory when value is set to
+         true. The definition.schemaFields value 'Snapshot' is required if this property is set to true,
+         else it must be excluded.
+        :paramtype include_snapshots: bool
+        :keyword include_deleted: For 'Container' definition.objectType the definition.schemaFields
+         must include 'Deleted, Version, DeletedTime and RemainingRetentionDays'. For 'Blob'
+         definition.objectType and HNS enabled storage accounts the definition.schemaFields must include
+         'DeletionId, Deleted, DeletedTime and RemainingRetentionDays' and for Hns disabled accounts the
+         definition.schemaFields must include 'Deleted and RemainingRetentionDays', else it must be
+         excluded.
+        :paramtype include_deleted: bool
+        :keyword creation_time: This property is used to filter objects based on the object creation
+         time.
+        :paramtype creation_time: ~azure.mgmt.storage.v2024_01_01.models.BlobInventoryCreationTime
+        """
+        super().__init__(**kwargs)
+        self.prefix_match = prefix_match
+        self.exclude_prefix = exclude_prefix
+        self.blob_types = blob_types
+        self.include_blob_versions = include_blob_versions
+        self.include_snapshots = include_snapshots
+        self.include_deleted = include_deleted
+        self.creation_time = creation_time
+
+
+class BlobInventoryPolicyRule(_serialization.Model):
+    """An object that wraps the blob inventory rule. Each rule is uniquely defined by name.
+
+    All required parameters must be populated in order to send to server.
+
+    :ivar enabled: Rule is enabled when set to true. Required.
+    :vartype enabled: bool
+    :ivar name: A rule name can contain any combination of alpha numeric characters. Rule name is
+     case-sensitive. It must be unique within a policy. Required.
+    :vartype name: str
+    :ivar destination: Container name where blob inventory files are stored. Must be pre-created.
+     Required.
+    :vartype destination: str
+    :ivar definition: An object that defines the blob inventory policy rule. Required.
+    :vartype definition: ~azure.mgmt.storage.v2024_01_01.models.BlobInventoryPolicyDefinition
+    """
+
+    _validation = {
+        "enabled": {"required": True},
+        "name": {"required": True},
+        "destination": {"required": True},
+        "definition": {"required": True},
+    }
+
+    _attribute_map = {
+        "enabled": {"key": "enabled", "type": "bool"},
+        "name": {"key": "name", "type": "str"},
+        "destination": {"key": "destination", "type": "str"},
+        "definition": {"key": "definition", "type": "BlobInventoryPolicyDefinition"},
+    }
+
+    def __init__(
+        self,
+        *,
+        enabled: bool,
+        name: str,
+        destination: str,
+        definition: "_models.BlobInventoryPolicyDefinition",
+        **kwargs: Any
+    ) -> None:
+        """
+        :keyword enabled: Rule is enabled when set to true. Required.
+        :paramtype enabled: bool
+        :keyword name: A rule name can contain any combination of alpha numeric characters. Rule name
+         is case-sensitive. It must be unique within a policy. Required.
+        :paramtype name: str
+        :keyword destination: Container name where blob inventory files are stored. Must be
+         pre-created. Required.
+        :paramtype destination: str
+        :keyword definition: An object that defines the blob inventory policy rule. Required.
+        :paramtype definition: ~azure.mgmt.storage.v2024_01_01.models.BlobInventoryPolicyDefinition
+        """
+        super().__init__(**kwargs)
+        self.enabled = enabled
+        self.name = name
+        self.destination = destination
+        self.definition = definition
+
+
+class BlobInventoryPolicySchema(_serialization.Model):
+    """The storage account blob inventory policy rules.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    All required parameters must be populated in order to send to server.
+
+    :ivar enabled: Policy is enabled if set to true. Required.
+    :vartype enabled: bool
+    :ivar destination: Deprecated Property from API version 2021-04-01 onwards, the required
+     destination container name must be specified at the rule level 'policy.rule.destination'.
+    :vartype destination: str
+    :ivar type: The valid value is Inventory. Required. "Inventory"
+    :vartype type: str or ~azure.mgmt.storage.v2024_01_01.models.InventoryRuleType
+    :ivar rules: The storage account blob inventory policy rules. The rule is applied when it is
+     enabled. Required.
+    :vartype rules: list[~azure.mgmt.storage.v2024_01_01.models.BlobInventoryPolicyRule]
+    """
+
+    _validation = {
+        "enabled": {"required": True},
+        "destination": {"readonly": True},
+        "type": {"required": True},
+        "rules": {"required": True},
+    }
+
+    _attribute_map = {
+        "enabled": {"key": "enabled", "type": "bool"},
+        "destination": {"key": "destination", "type": "str"},
+        "type": {"key": "type", "type": "str"},
+        "rules": {"key": "rules", "type": "[BlobInventoryPolicyRule]"},
+    }
+
+    def __init__(
+        self,
+        *,
+        enabled: bool,
+        type: Union[str, "_models.InventoryRuleType"],
+        rules: List["_models.BlobInventoryPolicyRule"],
+        **kwargs: Any
+    ) -> None:
+        """
+        :keyword enabled: Policy is enabled if set to true. Required.
+        :paramtype enabled: bool
+        :keyword type: The valid value is Inventory. Required. "Inventory"
+        :paramtype type: str or ~azure.mgmt.storage.v2024_01_01.models.InventoryRuleType
+        :keyword rules: The storage account blob inventory policy rules. The rule is applied when it is
+         enabled. Required.
+        :paramtype rules: list[~azure.mgmt.storage.v2024_01_01.models.BlobInventoryPolicyRule]
+        """
+        super().__init__(**kwargs)
+        self.enabled = enabled
+        self.destination = None
+        self.type = type
+        self.rules = rules
+
+
+class BlobRestoreParameters(_serialization.Model):
+    """Blob restore parameters.
+
+    All required parameters must be populated in order to send to server.
+
+    :ivar time_to_restore: Restore blob to the specified time. Required.
+    :vartype time_to_restore: ~datetime.datetime
+    :ivar blob_ranges: Blob ranges to restore. Required.
+    :vartype blob_ranges: list[~azure.mgmt.storage.v2024_01_01.models.BlobRestoreRange]
+    """
+
+    _validation = {
+        "time_to_restore": {"required": True},
+        "blob_ranges": {"required": True},
+    }
+
+    _attribute_map = {
+        "time_to_restore": {"key": "timeToRestore", "type": "iso-8601"},
+        "blob_ranges": {"key": "blobRanges", "type": "[BlobRestoreRange]"},
+    }
+
+    def __init__(
+        self, *, time_to_restore: datetime.datetime, blob_ranges: List["_models.BlobRestoreRange"], **kwargs: Any
+    ) -> None:
+        """
+        :keyword time_to_restore: Restore blob to the specified time. Required.
+        :paramtype time_to_restore: ~datetime.datetime
+        :keyword blob_ranges: Blob ranges to restore. Required.
+        :paramtype blob_ranges: list[~azure.mgmt.storage.v2024_01_01.models.BlobRestoreRange]
+        """
+        super().__init__(**kwargs)
+        self.time_to_restore = time_to_restore
+        self.blob_ranges = blob_ranges
+
+
+class BlobRestoreRange(_serialization.Model):
+    """Blob range.
+
+    All required parameters must be populated in order to send to server.
+
+    :ivar start_range: Blob start range. This is inclusive. Empty means account start. Required.
+    :vartype start_range: str
+    :ivar end_range: Blob end range. This is exclusive. Empty means account end. Required.
+    :vartype end_range: str
+    """
+
+    _validation = {
+        "start_range": {"required": True},
+        "end_range": {"required": True},
+    }
+
+    _attribute_map = {
+        "start_range": {"key": "startRange", "type": "str"},
+        "end_range": {"key": "endRange", "type": "str"},
+    }
+
+    def __init__(self, *, start_range: str, end_range: str, **kwargs: Any) -> None:
+        """
+        :keyword start_range: Blob start range. This is inclusive. Empty means account start. Required.
+        :paramtype start_range: str
+        :keyword end_range: Blob end range. This is exclusive. Empty means account end. Required.
+        :paramtype end_range: str
+        """
+        super().__init__(**kwargs)
+        self.start_range = start_range
+        self.end_range = end_range
+
+
+class BlobRestoreStatus(_serialization.Model):
+    """Blob restore status.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar status: The status of blob restore progress. Possible values are: - InProgress: Indicates
+     that blob restore is ongoing. - Complete: Indicates that blob restore has been completed
+     successfully. - Failed: Indicates that blob restore is failed. Known values are: "InProgress",
+     "Complete", and "Failed".
+    :vartype status: str or ~azure.mgmt.storage.v2024_01_01.models.BlobRestoreProgressStatus
+    :ivar failure_reason: Failure reason when blob restore is failed.
+    :vartype failure_reason: str
+    :ivar restore_id: Id for tracking blob restore request.
+    :vartype restore_id: str
+    :ivar parameters: Blob restore request parameters.
+    :vartype parameters: ~azure.mgmt.storage.v2024_01_01.models.BlobRestoreParameters
+    """
+
+    _validation = {
+        "status": {"readonly": True},
+        "failure_reason": {"readonly": True},
+        "restore_id": {"readonly": True},
+        "parameters": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "status": {"key": "status", "type": "str"},
+        "failure_reason": {"key": "failureReason", "type": "str"},
+        "restore_id": {"key": "restoreId", "type": "str"},
+        "parameters": {"key": "parameters", "type": "BlobRestoreParameters"},
+    }
+
+    def __init__(self, **kwargs: Any) -> None:
+        """ """
+        super().__init__(**kwargs)
+        self.status = None
+        self.failure_reason = None
+        self.restore_id = None
+        self.parameters = None
+
+
+class BlobServiceItems(_serialization.Model):
+    """BlobServiceItems.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar value: List of blob services returned.
+    :vartype value: list[~azure.mgmt.storage.v2024_01_01.models.BlobServiceProperties]
+    """
+
+    _validation = {
+        "value": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "value": {"key": "value", "type": "[BlobServiceProperties]"},
+    }
+
+    def __init__(self, **kwargs: Any) -> None:
+        """ """
+        super().__init__(**kwargs)
+        self.value = None
+
+
+class BlobServiceProperties(Resource):
+    """The properties of a storage account’s Blob service.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar id: Fully qualified resource ID for the resource. Ex -
+     /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}.  # pylint: disable=line-too-long
+    :vartype id: str
+    :ivar name: The name of the resource.
+    :vartype name: str
+    :ivar type: The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or
+     "Microsoft.Storage/storageAccounts".
+    :vartype type: str
+    :ivar sku: Sku name and tier.
+    :vartype sku: ~azure.mgmt.storage.v2024_01_01.models.Sku
+    :ivar cors: Specifies CORS rules for the Blob service. You can include up to five CorsRule
+     elements in the request. If no CorsRule elements are included in the request body, all CORS
+     rules will be deleted, and CORS will be disabled for the Blob service.
+    :vartype cors: ~azure.mgmt.storage.v2024_01_01.models.CorsRules
+    :ivar default_service_version: DefaultServiceVersion indicates the default version to use for
+     requests to the Blob service if an incoming request’s version is not specified. Possible values
+     include version 2008-10-27 and all more recent versions.
+    :vartype default_service_version: str
+    :ivar delete_retention_policy: The blob service properties for blob soft delete.
+    :vartype delete_retention_policy: ~azure.mgmt.storage.v2024_01_01.models.DeleteRetentionPolicy
+    :ivar is_versioning_enabled: Versioning is enabled if set to true.
+    :vartype is_versioning_enabled: bool
+    :ivar automatic_snapshot_policy_enabled: Deprecated in favor of isVersioningEnabled property.
+    :vartype automatic_snapshot_policy_enabled: bool
+    :ivar change_feed: The blob service properties for change feed events.
+    :vartype change_feed: ~azure.mgmt.storage.v2024_01_01.models.ChangeFeed
+    :ivar restore_policy: The blob service properties for blob restore policy.
+    :vartype restore_policy: ~azure.mgmt.storage.v2024_01_01.models.RestorePolicyProperties
+    :ivar container_delete_retention_policy: The blob service properties for container soft delete.
+    :vartype container_delete_retention_policy:
+     ~azure.mgmt.storage.v2024_01_01.models.DeleteRetentionPolicy
+    :ivar last_access_time_tracking_policy: The blob service property to configure last access time
+     based tracking policy.
+    :vartype last_access_time_tracking_policy:
+     ~azure.mgmt.storage.v2024_01_01.models.LastAccessTimeTrackingPolicy
+    """
+
+    _validation = {
+        "id": {"readonly": True},
+        "name": {"readonly": True},
+        "type": {"readonly": True},
+        "sku": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "id": {"key": "id", "type": "str"},
+        "name": {"key": "name", "type": "str"},
+        "type": {"key": "type", "type": "str"},
+        "sku": {"key": "sku", "type": "Sku"},
+        "cors": {"key": "properties.cors", "type": "CorsRules"},
+        "default_service_version": {"key": "properties.defaultServiceVersion", "type": "str"},
+        "delete_retention_policy": {"key": "properties.deleteRetentionPolicy", "type": "DeleteRetentionPolicy"},
+        "is_versioning_enabled": {"key": "properties.isVersioningEnabled", "type": "bool"},
+        "automatic_snapshot_policy_enabled": {"key": "properties.automaticSnapshotPolicyEnabled", "type": "bool"},
+        "change_feed": {"key": "properties.changeFeed", "type": "ChangeFeed"},
+        "restore_policy": {"key": "properties.restorePolicy", "type": "RestorePolicyProperties"},
+        "container_delete_retention_policy": {
+            "key": "properties.containerDeleteRetentionPolicy",
+            "type": "DeleteRetentionPolicy",
+        },
+        "last_access_time_tracking_policy": {
+            "key": "properties.lastAccessTimeTrackingPolicy",
+            "type": "LastAccessTimeTrackingPolicy",
+        },
+    }
+
+    def __init__(
+        self,
+        *,
+        cors: Optional["_models.CorsRules"] = None,
+        default_service_version: Optional[str] = None,
+        delete_retention_policy: Optional["_models.DeleteRetentionPolicy"] = None,
+        is_versioning_enabled: Optional[bool] = None,
+        automatic_snapshot_policy_enabled: Optional[bool] = None,
+        change_feed: Optional["_models.ChangeFeed"] = None,
+        restore_policy: Optional["_models.RestorePolicyProperties"] = None,
+        container_delete_retention_policy: Optional["_models.DeleteRetentionPolicy"] = None,
+        last_access_time_tracking_policy: Optional["_models.LastAccessTimeTrackingPolicy"] = None,
+        **kwargs: Any
+    ) -> None:
+        """
+        :keyword cors: Specifies CORS rules for the Blob service. You can include up to five CorsRule
+         elements in the request. If no CorsRule elements are included in the request body, all CORS
+         rules will be deleted, and CORS will be disabled for the Blob service.
+        :paramtype cors: ~azure.mgmt.storage.v2024_01_01.models.CorsRules
+        :keyword default_service_version: DefaultServiceVersion indicates the default version to use
+         for requests to the Blob service if an incoming request’s version is not specified. Possible
+         values include version 2008-10-27 and all more recent versions.
+        :paramtype default_service_version: str
+        :keyword delete_retention_policy: The blob service properties for blob soft delete.
+        :paramtype delete_retention_policy:
+         ~azure.mgmt.storage.v2024_01_01.models.DeleteRetentionPolicy
+        :keyword is_versioning_enabled: Versioning is enabled if set to true.
+        :paramtype is_versioning_enabled: bool
+        :keyword automatic_snapshot_policy_enabled: Deprecated in favor of isVersioningEnabled
+         property.
+        :paramtype automatic_snapshot_policy_enabled: bool
+        :keyword change_feed: The blob service properties for change feed events.
+        :paramtype change_feed: ~azure.mgmt.storage.v2024_01_01.models.ChangeFeed
+        :keyword restore_policy: The blob service properties for blob restore policy.
+        :paramtype restore_policy: ~azure.mgmt.storage.v2024_01_01.models.RestorePolicyProperties
+        :keyword container_delete_retention_policy: The blob service properties for container soft
+         delete.
+        :paramtype container_delete_retention_policy:
+         ~azure.mgmt.storage.v2024_01_01.models.DeleteRetentionPolicy
+        :keyword last_access_time_tracking_policy: The blob service property to configure last access
+         time based tracking policy.
+        :paramtype last_access_time_tracking_policy:
+         ~azure.mgmt.storage.v2024_01_01.models.LastAccessTimeTrackingPolicy
+        """
+        super().__init__(**kwargs)
+        self.sku = None
+        self.cors = cors
+        self.default_service_version = default_service_version
+        self.delete_retention_policy = delete_retention_policy
+        self.is_versioning_enabled = is_versioning_enabled
+        self.automatic_snapshot_policy_enabled = automatic_snapshot_policy_enabled
+        self.change_feed = change_feed
+        self.restore_policy = restore_policy
+        self.container_delete_retention_policy = container_delete_retention_policy
+        self.last_access_time_tracking_policy = last_access_time_tracking_policy
+
+
+class BurstingConstants(_serialization.Model):
+    """Constants used for calculating included burst IOPS and maximum burst credits for IOPS for a
+    file share in the storage account.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar burst_floor_iops: The guaranteed floor of burst IOPS for small file shares.
+    :vartype burst_floor_iops: int
+    :ivar burst_io_scalar: The scalar against provisioned IOPS in the file share included burst
+     IOPS formula.
+    :vartype burst_io_scalar: float
+    :ivar burst_timeframe_seconds: The time frame for bursting in seconds in the file share maximum
+     burst credits for IOPS formula.
+    :vartype burst_timeframe_seconds: int
+    """
+
+    _validation = {
+        "burst_floor_iops": {"readonly": True},
+        "burst_io_scalar": {"readonly": True},
+        "burst_timeframe_seconds": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "burst_floor_iops": {"key": "burstFloorIOPS", "type": "int"},
+        "burst_io_scalar": {"key": "burstIOScalar", "type": "float"},
+        "burst_timeframe_seconds": {"key": "burstTimeframeSeconds", "type": "int"},
+    }
+
+    def __init__(self, **kwargs: Any) -> None:
+        """ """
+        super().__init__(**kwargs)
+        self.burst_floor_iops = None
+        self.burst_io_scalar = None
+        self.burst_timeframe_seconds = None
+
+
+class ChangeFeed(_serialization.Model):
+    """The blob service properties for change feed events.
+
+    :ivar enabled: Indicates whether change feed event logging is enabled for the Blob service.
+    :vartype enabled: bool
+    :ivar retention_in_days: Indicates the duration of changeFeed retention in days. Minimum value
+     is 1 day and maximum value is 146000 days (400 years). A null value indicates an infinite
+     retention of the change feed.
+    :vartype retention_in_days: int
+    """
+
+    _validation = {
+        "retention_in_days": {"maximum": 146000, "minimum": 1},
+    }
+
+    _attribute_map = {
+        "enabled": {"key": "enabled", "type": "bool"},
+        "retention_in_days": {"key": "retentionInDays", "type": "int"},
+    }
+
+    def __init__(
+        self, *, enabled: Optional[bool] = None, retention_in_days: Optional[int] = None, **kwargs: Any
+    ) -> None:
+        """
+        :keyword enabled: Indicates whether change feed event logging is enabled for the Blob service.
+        :paramtype enabled: bool
+        :keyword retention_in_days: Indicates the duration of changeFeed retention in days. Minimum
+         value is 1 day and maximum value is 146000 days (400 years). A null value indicates an infinite
+         retention of the change feed.
+        :paramtype retention_in_days: int
+        """
+        super().__init__(**kwargs)
+        self.enabled = enabled
+        self.retention_in_days = retention_in_days
+
+
+class CheckNameAvailabilityResult(_serialization.Model):
+    """The CheckNameAvailability operation response.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar name_available: Gets a boolean value that indicates whether the name is available for you
+     to use. If true, the name is available. If false, the name has already been taken or is invalid
+     and cannot be used.
+    :vartype name_available: bool
+    :ivar reason: Gets the reason that a storage account name could not be used. The Reason element
+     is only returned if NameAvailable is false. Known values are: "AccountNameInvalid" and
+     "AlreadyExists".
+    :vartype reason: str or ~azure.mgmt.storage.v2024_01_01.models.Reason
+    :ivar message: Gets an error message explaining the Reason value in more detail.
+    :vartype message: str
+    """
+
+    _validation = {
+        "name_available": {"readonly": True},
+        "reason": {"readonly": True},
+        "message": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "name_available": {"key": "nameAvailable", "type": "bool"},
+        "reason": {"key": "reason", "type": "str"},
+        "message": {"key": "message", "type": "str"},
+    }
+
+    def __init__(self, **kwargs: Any) -> None:
+        """ """
+        super().__init__(**kwargs)
+        self.name_available = None
+        self.reason = None
+        self.message = None
+
+
+class CloudErrorBody(_serialization.Model):
+    """An error response from the Storage service.
+
+    :ivar code: An identifier for the error. Codes are invariant and are intended to be consumed
+     programmatically.
+    :vartype code: str
+    :ivar message: A message describing the error, intended to be suitable for display in a user
+     interface.
+    :vartype message: str
+    :ivar target: The target of the particular error. For example, the name of the property in
+     error.
+    :vartype target: str
+    :ivar details: A list of additional details about the error.
+    :vartype details: list[~azure.mgmt.storage.v2024_01_01.models.CloudErrorBody]
+    """
+
+    _attribute_map = {
+        "code": {"key": "code", "type": "str"},
+        "message": {"key": "message", "type": "str"},
+        "target": {"key": "target", "type": "str"},
+        "details": {"key": "details", "type": "[CloudErrorBody]"},
+    }
+
+    def __init__(
+        self,
+        *,
+        code: Optional[str] = None,
+        message: Optional[str] = None,
+        target: Optional[str] = None,
+        details: Optional[List["_models.CloudErrorBody"]] = None,
+        **kwargs: Any
+    ) -> None:
+        """
+        :keyword code: An identifier for the error. Codes are invariant and are intended to be consumed
+         programmatically.
+        :paramtype code: str
+        :keyword message: A message describing the error, intended to be suitable for display in a user
+         interface.
+        :paramtype message: str
+        :keyword target: The target of the particular error. For example, the name of the property in
+         error.
+        :paramtype target: str
+        :keyword details: A list of additional details about the error.
+        :paramtype details: list[~azure.mgmt.storage.v2024_01_01.models.CloudErrorBody]
+        """
+        super().__init__(**kwargs)
+        self.code = code
+        self.message = message
+        self.target = target
+        self.details = details
+
+
+class CorsRule(_serialization.Model):
+    """Specifies a CORS rule for the Blob service.
+
+    All required parameters must be populated in order to send to server.
+
+    :ivar allowed_origins: Required if CorsRule element is present. A list of origin domains that
+     will be allowed via CORS, or "*" to allow all domains. Required.
+    :vartype allowed_origins: list[str]
+    :ivar allowed_methods: Required if CorsRule element is present. A list of HTTP methods that are
+     allowed to be executed by the origin. Required.
+    :vartype allowed_methods: list[str or ~azure.mgmt.storage.v2024_01_01.models.AllowedMethods]
+    :ivar max_age_in_seconds: Required if CorsRule element is present. The number of seconds that
+     the client/browser should cache a preflight response. Required.
+    :vartype max_age_in_seconds: int
+    :ivar exposed_headers: Required if CorsRule element is present. A list of response headers to
+     expose to CORS clients. Required.
+    :vartype exposed_headers: list[str]
+    :ivar allowed_headers: Required if CorsRule element is present. A list of headers allowed to be
+     part of the cross-origin request. Required.
+    :vartype allowed_headers: list[str]
+    """
+
+    _validation = {
+        "allowed_origins": {"required": True},
+        "allowed_methods": {"required": True},
+        "max_age_in_seconds": {"required": True},
+        "exposed_headers": {"required": True},
+        "allowed_headers": {"required": True},
+    }
+
+    _attribute_map = {
+        "allowed_origins": {"key": "allowedOrigins", "type": "[str]"},
+        "allowed_methods": {"key": "allowedMethods", "type": "[str]"},
+        "max_age_in_seconds": {"key": "maxAgeInSeconds", "type": "int"},
+        "exposed_headers": {"key": "exposedHeaders", "type": "[str]"},
+        "allowed_headers": {"key": "allowedHeaders", "type": "[str]"},
+    }
+
+    def __init__(
+        self,
+        *,
+        allowed_origins: List[str],
+        allowed_methods: List[Union[str, "_models.AllowedMethods"]],
+        max_age_in_seconds: int,
+        exposed_headers: List[str],
+        allowed_headers: List[str],
+        **kwargs: Any
+    ) -> None:
+        """
+        :keyword allowed_origins: Required if CorsRule element is present. A list of origin domains
+         that will be allowed via CORS, or "*" to allow all domains. Required.
+        :paramtype allowed_origins: list[str]
+        :keyword allowed_methods: Required if CorsRule element is present. A list of HTTP methods that
+         are allowed to be executed by the origin. Required.
+        :paramtype allowed_methods: list[str or ~azure.mgmt.storage.v2024_01_01.models.AllowedMethods]
+        :keyword max_age_in_seconds: Required if CorsRule element is present. The number of seconds
+         that the client/browser should cache a preflight response. Required.
+        :paramtype max_age_in_seconds: int
+        :keyword exposed_headers: Required if CorsRule element is present. A list of response headers
+         to expose to CORS clients. Required.
+        :paramtype exposed_headers: list[str]
+        :keyword allowed_headers: Required if CorsRule element is present. A list of headers allowed to
+         be part of the cross-origin request. Required.
+        :paramtype allowed_headers: list[str]
+        """
+        super().__init__(**kwargs)
+        self.allowed_origins = allowed_origins
+        self.allowed_methods = allowed_methods
+        self.max_age_in_seconds = max_age_in_seconds
+        self.exposed_headers = exposed_headers
+        self.allowed_headers = allowed_headers
+
+
+class CorsRules(_serialization.Model):
+    """Sets the CORS rules. You can include up to five CorsRule elements in the request.
+
+    :ivar cors_rules: The List of CORS rules. You can include up to five CorsRule elements in the
+     request.
+    :vartype cors_rules: list[~azure.mgmt.storage.v2024_01_01.models.CorsRule]
+    """
+
+    _attribute_map = {
+        "cors_rules": {"key": "corsRules", "type": "[CorsRule]"},
+    }
+
+    def __init__(self, *, cors_rules: Optional[List["_models.CorsRule"]] = None, **kwargs: Any) -> None:
+        """
+        :keyword cors_rules: The List of CORS rules. You can include up to five CorsRule elements in
+         the request.
+        :paramtype cors_rules: list[~azure.mgmt.storage.v2024_01_01.models.CorsRule]
+        """
+        super().__init__(**kwargs)
+        self.cors_rules = cors_rules
+
+
+class CustomDomain(_serialization.Model):
+    """The custom domain assigned to this storage account. This can be set via Update.
+
+    All required parameters must be populated in order to send to server.
+
+    :ivar name: Gets or sets the custom domain name assigned to the storage account. Name is the
+     CNAME source. Required.
+    :vartype name: str
+    :ivar use_sub_domain_name: Indicates whether indirect CName validation is enabled. Default
+     value is false. This should only be set on updates.
+    :vartype use_sub_domain_name: bool
+    """
+
+    _validation = {
+        "name": {"required": True},
+    }
+
+    _attribute_map = {
+        "name": {"key": "name", "type": "str"},
+        "use_sub_domain_name": {"key": "useSubDomainName", "type": "bool"},
+    }
+
+    def __init__(self, *, name: str, use_sub_domain_name: Optional[bool] = None, **kwargs: Any) -> None:
+        """
+        :keyword name: Gets or sets the custom domain name assigned to the storage account. Name is the
+         CNAME source. Required.
+        :paramtype name: str
+        :keyword use_sub_domain_name: Indicates whether indirect CName validation is enabled. Default
+         value is false. This should only be set on updates.
+        :paramtype use_sub_domain_name: bool
+        """
+        super().__init__(**kwargs)
+        self.name = name
+        self.use_sub_domain_name = use_sub_domain_name
+
+
+class DateAfterCreation(_serialization.Model):
+    """Object to define snapshot and version action conditions.
+
+    All required parameters must be populated in order to send to server.
+
+    :ivar days_after_creation_greater_than: Value indicating the age in days after creation.
+     Required.
+    :vartype days_after_creation_greater_than: float
+    :ivar days_after_last_tier_change_greater_than: Value indicating the age in days after last
+     blob tier change time. This property is only applicable for tierToArchive actions and requires
+     daysAfterCreationGreaterThan to be set for snapshots and blob version based actions. The blob
+     will be archived if both the conditions are satisfied.
+    :vartype days_after_last_tier_change_greater_than: float
+    """
+
+    _validation = {
+        "days_after_creation_greater_than": {"required": True, "minimum": 0, "multiple": 1},
+        "days_after_last_tier_change_greater_than": {"minimum": 0, "multiple": 1},
+    }
+
+    _attribute_map = {
+        "days_after_creation_greater_than": {"key": "daysAfterCreationGreaterThan", "type": "float"},
+        "days_after_last_tier_change_greater_than": {"key": "daysAfterLastTierChangeGreaterThan", "type": "float"},
+    }
+
+    def __init__(
+        self,
+        *,
+        days_after_creation_greater_than: float,
+        days_after_last_tier_change_greater_than: Optional[float] = None,
+        **kwargs: Any
+    ) -> None:
+        """
+        :keyword days_after_creation_greater_than: Value indicating the age in days after creation.
+         Required.
+        :paramtype days_after_creation_greater_than: float
+        :keyword days_after_last_tier_change_greater_than: Value indicating the age in days after last
+         blob tier change time. This property is only applicable for tierToArchive actions and requires
+         daysAfterCreationGreaterThan to be set for snapshots and blob version based actions. The blob
+         will be archived if both the conditions are satisfied.
+        :paramtype days_after_last_tier_change_greater_than: float
+        """
+        super().__init__(**kwargs)
+        self.days_after_creation_greater_than = days_after_creation_greater_than
+        self.days_after_last_tier_change_greater_than = days_after_last_tier_change_greater_than
+
+
+class DateAfterModification(_serialization.Model):
+    """Object to define the base blob action conditions. Properties daysAfterModificationGreaterThan,
+    daysAfterLastAccessTimeGreaterThan and daysAfterCreationGreaterThan are mutually exclusive. The
+    daysAfterLastTierChangeGreaterThan property is only applicable for tierToArchive actions which
+    requires daysAfterModificationGreaterThan to be set, also it cannot be used in conjunction with
+    daysAfterLastAccessTimeGreaterThan or daysAfterCreationGreaterThan.
+
+    :ivar days_after_modification_greater_than: Value indicating the age in days after last
+     modification.
+    :vartype days_after_modification_greater_than: float
+    :ivar days_after_last_access_time_greater_than: Value indicating the age in days after last
+     blob access. This property can only be used in conjunction with last access time tracking
+     policy.
+    :vartype days_after_last_access_time_greater_than: float
+    :ivar days_after_last_tier_change_greater_than: Value indicating the age in days after last
+     blob tier change time. This property is only applicable for tierToArchive actions and requires
+     daysAfterModificationGreaterThan to be set for baseBlobs based actions. The blob will be
+     archived if both the conditions are satisfied.
+    :vartype days_after_last_tier_change_greater_than: float
+    :ivar days_after_creation_greater_than: Value indicating the age in days after blob creation.
+    :vartype days_after_creation_greater_than: float
+    """
+
+    _validation = {
+        "days_after_modification_greater_than": {"minimum": 0, "multiple": 1},
+        "days_after_last_access_time_greater_than": {"minimum": 0, "multiple": 1},
+        "days_after_last_tier_change_greater_than": {"minimum": 0, "multiple": 1},
+        "days_after_creation_greater_than": {"minimum": 0, "multiple": 1},
+    }
+
+    _attribute_map = {
+        "days_after_modification_greater_than": {"key": "daysAfterModificationGreaterThan", "type": "float"},
+        "days_after_last_access_time_greater_than": {"key": "daysAfterLastAccessTimeGreaterThan", "type": "float"},
+        "days_after_last_tier_change_greater_than": {"key": "daysAfterLastTierChangeGreaterThan", "type": "float"},
+        "days_after_creation_greater_than": {"key": "daysAfterCreationGreaterThan", "type": "float"},
+    }
+
+    def __init__(
+        self,
+        *,
+        days_after_modification_greater_than: Optional[float] = None,
+        days_after_last_access_time_greater_than: Optional[float] = None,
+        days_after_last_tier_change_greater_than: Optional[float] = None,
+        days_after_creation_greater_than: Optional[float] = None,
+        **kwargs: Any
+    ) -> None:
+        """
+        :keyword days_after_modification_greater_than: Value indicating the age in days after last
+         modification.
+        :paramtype days_after_modification_greater_than: float
+        :keyword days_after_last_access_time_greater_than: Value indicating the age in days after last
+         blob access. This property can only be used in conjunction with last access time tracking
+         policy.
+        :paramtype days_after_last_access_time_greater_than: float
+        :keyword days_after_last_tier_change_greater_than: Value indicating the age in days after last
+         blob tier change time. This property is only applicable for tierToArchive actions and requires
+         daysAfterModificationGreaterThan to be set for baseBlobs based actions. The blob will be
+         archived if both the conditions are satisfied.
+        :paramtype days_after_last_tier_change_greater_than: float
+        :keyword days_after_creation_greater_than: Value indicating the age in days after blob
+         creation.
+        :paramtype days_after_creation_greater_than: float
+        """
+        super().__init__(**kwargs)
+        self.days_after_modification_greater_than = days_after_modification_greater_than
+        self.days_after_last_access_time_greater_than = days_after_last_access_time_greater_than
+        self.days_after_last_tier_change_greater_than = days_after_last_tier_change_greater_than
+        self.days_after_creation_greater_than = days_after_creation_greater_than
+
+
+class ProxyResource(Resource):
+    """The resource model definition for a Azure Resource Manager proxy resource. It will not have
+    tags and a location.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar id: Fully qualified resource ID for the resource. Ex -
+     /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}.  # pylint: disable=line-too-long
+    :vartype id: str
+    :ivar name: The name of the resource.
+    :vartype name: str
+    :ivar type: The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or
+     "Microsoft.Storage/storageAccounts".
+    :vartype type: str
+    """
+
+
+class DeletedAccount(ProxyResource):
+    """Deleted storage account.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar id: Fully qualified resource ID for the resource. Ex -
+     /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}.  # pylint: disable=line-too-long
+    :vartype id: str
+    :ivar name: The name of the resource.
+    :vartype name: str
+    :ivar type: The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or
+     "Microsoft.Storage/storageAccounts".
+    :vartype type: str
+    :ivar storage_account_resource_id: Full resource id of the original storage account.
+    :vartype storage_account_resource_id: str
+    :ivar location: Location of the deleted account.
+    :vartype location: str
+    :ivar restore_reference: Can be used to attempt recovering this deleted account via
+     PutStorageAccount API.
+    :vartype restore_reference: str
+    :ivar creation_time: Creation time of the deleted account.
+    :vartype creation_time: str
+    :ivar deletion_time: Deletion time of the deleted account.
+    :vartype deletion_time: str
+    """
+
+    _validation = {
+        "id": {"readonly": True},
+        "name": {"readonly": True},
+        "type": {"readonly": True},
+        "storage_account_resource_id": {"readonly": True},
+        "location": {"readonly": True},
+        "restore_reference": {"readonly": True},
+        "creation_time": {"readonly": True},
+        "deletion_time": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "id": {"key": "id", "type": "str"},
+        "name": {"key": "name", "type": "str"},
+        "type": {"key": "type", "type": "str"},
+        "storage_account_resource_id": {"key": "properties.storageAccountResourceId", "type": "str"},
+        "location": {"key": "properties.location", "type": "str"},
+        "restore_reference": {"key": "properties.restoreReference", "type": "str"},
+        "creation_time": {"key": "properties.creationTime", "type": "str"},
+        "deletion_time": {"key": "properties.deletionTime", "type": "str"},
+    }
+
+    def __init__(self, **kwargs: Any) -> None:
+        """ """
+        super().__init__(**kwargs)
+        self.storage_account_resource_id = None
+        self.location = None
+        self.restore_reference = None
+        self.creation_time = None
+        self.deletion_time = None
+
+
+class DeletedAccountListResult(_serialization.Model):
+    """The response from the List Deleted Accounts operation.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar value: Gets the list of deleted accounts and their properties.
+    :vartype value: list[~azure.mgmt.storage.v2024_01_01.models.DeletedAccount]
+    :ivar next_link: Request URL that can be used to query next page of deleted accounts. Returned
+     when total number of requested deleted accounts exceed maximum page size.
+    :vartype next_link: str
+    """
+
+    _validation = {
+        "value": {"readonly": True},
+        "next_link": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "value": {"key": "value", "type": "[DeletedAccount]"},
+        "next_link": {"key": "nextLink", "type": "str"},
+    }
+
+    def __init__(self, **kwargs: Any) -> None:
+        """ """
+        super().__init__(**kwargs)
+        self.value = None
+        self.next_link = None
+
+
+class DeletedShare(_serialization.Model):
+    """The deleted share to be restored.
+
+    All required parameters must be populated in order to send to server.
+
+    :ivar deleted_share_name: Required. Identify the name of the deleted share that will be
+     restored. Required.
+    :vartype deleted_share_name: str
+    :ivar deleted_share_version: Required. Identify the version of the deleted share that will be
+     restored. Required.
+    :vartype deleted_share_version: str
+    """
+
+    _validation = {
+        "deleted_share_name": {"required": True},
+        "deleted_share_version": {"required": True},
+    }
+
+    _attribute_map = {
+        "deleted_share_name": {"key": "deletedShareName", "type": "str"},
+        "deleted_share_version": {"key": "deletedShareVersion", "type": "str"},
+    }
+
+    def __init__(self, *, deleted_share_name: str, deleted_share_version: str, **kwargs: Any) -> None:
+        """
+        :keyword deleted_share_name: Required. Identify the name of the deleted share that will be
+         restored. Required.
+        :paramtype deleted_share_name: str
+        :keyword deleted_share_version: Required. Identify the version of the deleted share that will
+         be restored. Required.
+        :paramtype deleted_share_version: str
+        """
+        super().__init__(**kwargs)
+        self.deleted_share_name = deleted_share_name
+        self.deleted_share_version = deleted_share_version
+
+
+class DeleteRetentionPolicy(_serialization.Model):
+    """The service properties for soft delete.
+
+    :ivar enabled: Indicates whether DeleteRetentionPolicy is enabled.
+    :vartype enabled: bool
+    :ivar days: Indicates the number of days that the deleted item should be retained. The minimum
+     specified value can be 1 and the maximum value can be 365.
+    :vartype days: int
+    :ivar allow_permanent_delete: This property when set to true allows deletion of the soft
+     deleted blob versions and snapshots. This property cannot be used blob restore policy. This
+     property only applies to blob service and does not apply to containers or file share.
+    :vartype allow_permanent_delete: bool
+    """
+
+    _validation = {
+        "days": {"maximum": 365, "minimum": 1},
+    }
+
+    _attribute_map = {
+        "enabled": {"key": "enabled", "type": "bool"},
+        "days": {"key": "days", "type": "int"},
+        "allow_permanent_delete": {"key": "allowPermanentDelete", "type": "bool"},
+    }
+
+    def __init__(
+        self,
+        *,
+        enabled: Optional[bool] = None,
+        days: Optional[int] = None,
+        allow_permanent_delete: Optional[bool] = None,
+        **kwargs: Any
+    ) -> None:
+        """
+        :keyword enabled: Indicates whether DeleteRetentionPolicy is enabled.
+        :paramtype enabled: bool
+        :keyword days: Indicates the number of days that the deleted item should be retained. The
+         minimum specified value can be 1 and the maximum value can be 365.
+        :paramtype days: int
+        :keyword allow_permanent_delete: This property when set to true allows deletion of the soft
+         deleted blob versions and snapshots. This property cannot be used blob restore policy. This
+         property only applies to blob service and does not apply to containers or file share.
+        :paramtype allow_permanent_delete: bool
+        """
+        super().__init__(**kwargs)
+        self.enabled = enabled
+        self.days = days
+        self.allow_permanent_delete = allow_permanent_delete
+
+
+class Dimension(_serialization.Model):
+    """Dimension of blobs, possibly be blob type or access tier.
+
+    :ivar name: Display name of dimension.
+    :vartype name: str
+    :ivar display_name: Display name of dimension.
+    :vartype display_name: str
+    """
+
+    _attribute_map = {
+        "name": {"key": "name", "type": "str"},
+        "display_name": {"key": "displayName", "type": "str"},
+    }
+
+    def __init__(self, *, name: Optional[str] = None, display_name: Optional[str] = None, **kwargs: Any) -> None:
+        """
+        :keyword name: Display name of dimension.
+        :paramtype name: str
+        :keyword display_name: Display name of dimension.
+        :paramtype display_name: str
+        """
+        super().__init__(**kwargs)
+        self.name = name
+        self.display_name = display_name
+
+
+class Encryption(_serialization.Model):
+    """The encryption settings on the storage account.
+
+    :ivar services: List of services which support encryption.
+    :vartype services: ~azure.mgmt.storage.v2024_01_01.models.EncryptionServices
+    :ivar key_source: The encryption keySource (provider). Possible values (case-insensitive):
+     Microsoft.Storage, Microsoft.Keyvault. Known values are: "Microsoft.Storage" and
+     "Microsoft.Keyvault".
+    :vartype key_source: str or ~azure.mgmt.storage.v2024_01_01.models.KeySource
+    :ivar require_infrastructure_encryption: A boolean indicating whether or not the service
+     applies a secondary layer of encryption with platform managed keys for data at rest.
+    :vartype require_infrastructure_encryption: bool
+    :ivar key_vault_properties: Properties provided by key vault.
+    :vartype key_vault_properties: ~azure.mgmt.storage.v2024_01_01.models.KeyVaultProperties
+    :ivar encryption_identity: The identity to be used with service-side encryption at rest.
+    :vartype encryption_identity: ~azure.mgmt.storage.v2024_01_01.models.EncryptionIdentity
+    """
+
+    _attribute_map = {
+        "services": {"key": "services", "type": "EncryptionServices"},
+        "key_source": {"key": "keySource", "type": "str"},
+        "require_infrastructure_encryption": {"key": "requireInfrastructureEncryption", "type": "bool"},
+        "key_vault_properties": {"key": "keyvaultproperties", "type": "KeyVaultProperties"},
+        "encryption_identity": {"key": "identity", "type": "EncryptionIdentity"},
+    }
+
+    def __init__(
+        self,
+        *,
+        services: Optional["_models.EncryptionServices"] = None,
+        key_source: Union[str, "_models.KeySource"] = "Microsoft.Storage",
+        require_infrastructure_encryption: Optional[bool] = None,
+        key_vault_properties: Optional["_models.KeyVaultProperties"] = None,
+        encryption_identity: Optional["_models.EncryptionIdentity"] = None,
+        **kwargs: Any
+    ) -> None:
+        """
+        :keyword services: List of services which support encryption.
+        :paramtype services: ~azure.mgmt.storage.v2024_01_01.models.EncryptionServices
+        :keyword key_source: The encryption keySource (provider). Possible values (case-insensitive):
+         Microsoft.Storage, Microsoft.Keyvault. Known values are: "Microsoft.Storage" and
+         "Microsoft.Keyvault".
+        :paramtype key_source: str or ~azure.mgmt.storage.v2024_01_01.models.KeySource
+        :keyword require_infrastructure_encryption: A boolean indicating whether or not the service
+         applies a secondary layer of encryption with platform managed keys for data at rest.
+        :paramtype require_infrastructure_encryption: bool
+        :keyword key_vault_properties: Properties provided by key vault.
+        :paramtype key_vault_properties: ~azure.mgmt.storage.v2024_01_01.models.KeyVaultProperties
+        :keyword encryption_identity: The identity to be used with service-side encryption at rest.
+        :paramtype encryption_identity: ~azure.mgmt.storage.v2024_01_01.models.EncryptionIdentity
+        """
+        super().__init__(**kwargs)
+        self.services = services
+        self.key_source = key_source
+        self.require_infrastructure_encryption = require_infrastructure_encryption
+        self.key_vault_properties = key_vault_properties
+        self.encryption_identity = encryption_identity
+
+
+class EncryptionIdentity(_serialization.Model):
+    """Encryption identity for the storage account.
+
+    :ivar encryption_user_assigned_identity: Resource identifier of the UserAssigned identity to be
+     associated with server-side encryption on the storage account.
+    :vartype encryption_user_assigned_identity: str
+    :ivar encryption_federated_identity_client_id: ClientId of the multi-tenant application to be
+     used in conjunction with the user-assigned identity for cross-tenant customer-managed-keys
+     server-side encryption on the storage account.
+    :vartype encryption_federated_identity_client_id: str
+    """
+
+    _attribute_map = {
+        "encryption_user_assigned_identity": {"key": "userAssignedIdentity", "type": "str"},
+        "encryption_federated_identity_client_id": {"key": "federatedIdentityClientId", "type": "str"},
+    }
+
+    def __init__(
+        self,
+        *,
+        encryption_user_assigned_identity: Optional[str] = None,
+        encryption_federated_identity_client_id: Optional[str] = None,
+        **kwargs: Any
+    ) -> None:
+        """
+        :keyword encryption_user_assigned_identity: Resource identifier of the UserAssigned identity to
+         be associated with server-side encryption on the storage account.
+        :paramtype encryption_user_assigned_identity: str
+        :keyword encryption_federated_identity_client_id: ClientId of the multi-tenant application to
+         be used in conjunction with the user-assigned identity for cross-tenant customer-managed-keys
+         server-side encryption on the storage account.
+        :paramtype encryption_federated_identity_client_id: str
+        """
+        super().__init__(**kwargs)
+        self.encryption_user_assigned_identity = encryption_user_assigned_identity
+        self.encryption_federated_identity_client_id = encryption_federated_identity_client_id
+
+
+class EncryptionScope(Resource):
+    """The Encryption Scope resource.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar id: Fully qualified resource ID for the resource. Ex -
+     /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}.  # pylint: disable=line-too-long
+    :vartype id: str
+    :ivar name: The name of the resource.
+    :vartype name: str
+    :ivar type: The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or
+     "Microsoft.Storage/storageAccounts".
+    :vartype type: str
+    :ivar source: The provider for the encryption scope. Possible values (case-insensitive):
+     Microsoft.Storage, Microsoft.KeyVault. Known values are: "Microsoft.Storage" and
+     "Microsoft.KeyVault".
+    :vartype source: str or ~azure.mgmt.storage.v2024_01_01.models.EncryptionScopeSource
+    :ivar state: The state of the encryption scope. Possible values (case-insensitive):  Enabled,
+     Disabled. Known values are: "Enabled" and "Disabled".
+    :vartype state: str or ~azure.mgmt.storage.v2024_01_01.models.EncryptionScopeState
+    :ivar creation_time: Gets the creation date and time of the encryption scope in UTC.
+    :vartype creation_time: ~datetime.datetime
+    :ivar last_modified_time: Gets the last modification date and time of the encryption scope in
+     UTC.
+    :vartype last_modified_time: ~datetime.datetime
+    :ivar key_vault_properties: The key vault properties for the encryption scope. This is a
+     required field if encryption scope 'source' attribute is set to 'Microsoft.KeyVault'.
+    :vartype key_vault_properties:
+     ~azure.mgmt.storage.v2024_01_01.models.EncryptionScopeKeyVaultProperties
+    :ivar require_infrastructure_encryption: A boolean indicating whether or not the service
+     applies a secondary layer of encryption with platform managed keys for data at rest.
+    :vartype require_infrastructure_encryption: bool
+    """
+
+    _validation = {
+        "id": {"readonly": True},
+        "name": {"readonly": True},
+        "type": {"readonly": True},
+        "creation_time": {"readonly": True},
+        "last_modified_time": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "id": {"key": "id", "type": "str"},
+        "name": {"key": "name", "type": "str"},
+        "type": {"key": "type", "type": "str"},
+        "source": {"key": "properties.source", "type": "str"},
+        "state": {"key": "properties.state", "type": "str"},
+        "creation_time": {"key": "properties.creationTime", "type": "iso-8601"},
+        "last_modified_time": {"key": "properties.lastModifiedTime", "type": "iso-8601"},
+        "key_vault_properties": {"key": "properties.keyVaultProperties", "type": "EncryptionScopeKeyVaultProperties"},
+        "require_infrastructure_encryption": {"key": "properties.requireInfrastructureEncryption", "type": "bool"},
+    }
+
+    def __init__(
+        self,
+        *,
+        source: Optional[Union[str, "_models.EncryptionScopeSource"]] = None,
+        state: Optional[Union[str, "_models.EncryptionScopeState"]] = None,
+        key_vault_properties: Optional["_models.EncryptionScopeKeyVaultProperties"] = None,
+        require_infrastructure_encryption: Optional[bool] = None,
+        **kwargs: Any
+    ) -> None:
+        """
+        :keyword source: The provider for the encryption scope. Possible values (case-insensitive):
+         Microsoft.Storage, Microsoft.KeyVault. Known values are: "Microsoft.Storage" and
+         "Microsoft.KeyVault".
+        :paramtype source: str or ~azure.mgmt.storage.v2024_01_01.models.EncryptionScopeSource
+        :keyword state: The state of the encryption scope. Possible values (case-insensitive):
+         Enabled, Disabled. Known values are: "Enabled" and "Disabled".
+        :paramtype state: str or ~azure.mgmt.storage.v2024_01_01.models.EncryptionScopeState
+        :keyword key_vault_properties: The key vault properties for the encryption scope. This is a
+         required field if encryption scope 'source' attribute is set to 'Microsoft.KeyVault'.
+        :paramtype key_vault_properties:
+         ~azure.mgmt.storage.v2024_01_01.models.EncryptionScopeKeyVaultProperties
+        :keyword require_infrastructure_encryption: A boolean indicating whether or not the service
+         applies a secondary layer of encryption with platform managed keys for data at rest.
+        :paramtype require_infrastructure_encryption: bool
+        """
+        super().__init__(**kwargs)
+        self.source = source
+        self.state = state
+        self.creation_time = None
+        self.last_modified_time = None
+        self.key_vault_properties = key_vault_properties
+        self.require_infrastructure_encryption = require_infrastructure_encryption
+
+
+class EncryptionScopeKeyVaultProperties(_serialization.Model):
+    """The key vault properties for the encryption scope. This is a required field if encryption scope
+    'source' attribute is set to 'Microsoft.KeyVault'.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar key_uri: The object identifier for a key vault key object. When applied, the encryption
+     scope will use the key referenced by the identifier to enable customer-managed key support on
+     this encryption scope.
+    :vartype key_uri: str
+    :ivar current_versioned_key_identifier: The object identifier of the current versioned Key
+     Vault Key in use.
+    :vartype current_versioned_key_identifier: str
+    :ivar last_key_rotation_timestamp: Timestamp of last rotation of the Key Vault Key.
+    :vartype last_key_rotation_timestamp: ~datetime.datetime
+    """
+
+    _validation = {
+        "current_versioned_key_identifier": {"readonly": True},
+        "last_key_rotation_timestamp": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "key_uri": {"key": "keyUri", "type": "str"},
+        "current_versioned_key_identifier": {"key": "currentVersionedKeyIdentifier", "type": "str"},
+        "last_key_rotation_timestamp": {"key": "lastKeyRotationTimestamp", "type": "iso-8601"},
+    }
+
+    def __init__(self, *, key_uri: Optional[str] = None, **kwargs: Any) -> None:
+        """
+        :keyword key_uri: The object identifier for a key vault key object. When applied, the
+         encryption scope will use the key referenced by the identifier to enable customer-managed key
+         support on this encryption scope.
+        :paramtype key_uri: str
+        """
+        super().__init__(**kwargs)
+        self.key_uri = key_uri
+        self.current_versioned_key_identifier = None
+        self.last_key_rotation_timestamp = None
+
+
+class EncryptionScopeListResult(_serialization.Model):
+    """List of encryption scopes requested, and if paging is required, a URL to the next page of
+    encryption scopes.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar value: List of encryption scopes requested.
+    :vartype value: list[~azure.mgmt.storage.v2024_01_01.models.EncryptionScope]
+    :ivar next_link: Request URL that can be used to query next page of encryption scopes. Returned
+     when total number of requested encryption scopes exceeds the maximum page size.
+    :vartype next_link: str
+    """
+
+    _validation = {
+        "value": {"readonly": True},
+        "next_link": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "value": {"key": "value", "type": "[EncryptionScope]"},
+        "next_link": {"key": "nextLink", "type": "str"},
+    }
+
+    def __init__(self, **kwargs: Any) -> None:
+        """ """
+        super().__init__(**kwargs)
+        self.value = None
+        self.next_link = None
+
+
+class EncryptionService(_serialization.Model):
+    """A service that allows server-side encryption to be used.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar enabled: A boolean indicating whether or not the service encrypts the data as it is
+     stored. Encryption at rest is enabled by default today and cannot be disabled.
+    :vartype enabled: bool
+    :ivar last_enabled_time: Gets a rough estimate of the date/time when the encryption was last
+     enabled by the user. Data is encrypted at rest by default today and cannot be disabled.
+    :vartype last_enabled_time: ~datetime.datetime
+    :ivar key_type: Encryption key type to be used for the encryption service. 'Account' key type
+     implies that an account-scoped encryption key will be used. 'Service' key type implies that a
+     default service key is used. Known values are: "Service" and "Account".
+    :vartype key_type: str or ~azure.mgmt.storage.v2024_01_01.models.KeyType
+    """
+
+    _validation = {
+        "last_enabled_time": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "enabled": {"key": "enabled", "type": "bool"},
+        "last_enabled_time": {"key": "lastEnabledTime", "type": "iso-8601"},
+        "key_type": {"key": "keyType", "type": "str"},
+    }
+
+    def __init__(
+        self, *, enabled: Optional[bool] = None, key_type: Optional[Union[str, "_models.KeyType"]] = None, **kwargs: Any
+    ) -> None:
+        """
+        :keyword enabled: A boolean indicating whether or not the service encrypts the data as it is
+         stored. Encryption at rest is enabled by default today and cannot be disabled.
+        :paramtype enabled: bool
+        :keyword key_type: Encryption key type to be used for the encryption service. 'Account' key
+         type implies that an account-scoped encryption key will be used. 'Service' key type implies
+         that a default service key is used. Known values are: "Service" and "Account".
+        :paramtype key_type: str or ~azure.mgmt.storage.v2024_01_01.models.KeyType
+        """
+        super().__init__(**kwargs)
+        self.enabled = enabled
+        self.last_enabled_time = None
+        self.key_type = key_type
+
+
+class EncryptionServices(_serialization.Model):
+    """A list of services that support encryption.
+
+    :ivar blob: The encryption function of the blob storage service.
+    :vartype blob: ~azure.mgmt.storage.v2024_01_01.models.EncryptionService
+    :ivar file: The encryption function of the file storage service.
+    :vartype file: ~azure.mgmt.storage.v2024_01_01.models.EncryptionService
+    :ivar table: The encryption function of the table storage service.
+    :vartype table: ~azure.mgmt.storage.v2024_01_01.models.EncryptionService
+    :ivar queue: The encryption function of the queue storage service.
+    :vartype queue: ~azure.mgmt.storage.v2024_01_01.models.EncryptionService
+    """
+
+    _attribute_map = {
+        "blob": {"key": "blob", "type": "EncryptionService"},
+        "file": {"key": "file", "type": "EncryptionService"},
+        "table": {"key": "table", "type": "EncryptionService"},
+        "queue": {"key": "queue", "type": "EncryptionService"},
+    }
+
+    def __init__(
+        self,
+        *,
+        blob: Optional["_models.EncryptionService"] = None,
+        file: Optional["_models.EncryptionService"] = None,
+        table: Optional["_models.EncryptionService"] = None,
+        queue: Optional["_models.EncryptionService"] = None,
+        **kwargs: Any
+    ) -> None:
+        """
+        :keyword blob: The encryption function of the blob storage service.
+        :paramtype blob: ~azure.mgmt.storage.v2024_01_01.models.EncryptionService
+        :keyword file: The encryption function of the file storage service.
+        :paramtype file: ~azure.mgmt.storage.v2024_01_01.models.EncryptionService
+        :keyword table: The encryption function of the table storage service.
+        :paramtype table: ~azure.mgmt.storage.v2024_01_01.models.EncryptionService
+        :keyword queue: The encryption function of the queue storage service.
+        :paramtype queue: ~azure.mgmt.storage.v2024_01_01.models.EncryptionService
+        """
+        super().__init__(**kwargs)
+        self.blob = blob
+        self.file = file
+        self.table = table
+        self.queue = queue
+
+
+class Endpoints(_serialization.Model):
+    """The URIs that are used to perform a retrieval of a public blob, queue, table, web or dfs
+    object.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar blob: Gets the blob endpoint.
+    :vartype blob: str
+    :ivar queue: Gets the queue endpoint.
+    :vartype queue: str
+    :ivar table: Gets the table endpoint.
+    :vartype table: str
+    :ivar file: Gets the file endpoint.
+    :vartype file: str
+    :ivar web: Gets the web endpoint.
+    :vartype web: str
+    :ivar dfs: Gets the dfs endpoint.
+    :vartype dfs: str
+    :ivar microsoft_endpoints: Gets the microsoft routing storage endpoints.
+    :vartype microsoft_endpoints:
+     ~azure.mgmt.storage.v2024_01_01.models.StorageAccountMicrosoftEndpoints
+    :ivar internet_endpoints: Gets the internet routing storage endpoints.
+    :vartype internet_endpoints:
+     ~azure.mgmt.storage.v2024_01_01.models.StorageAccountInternetEndpoints
+    """
+
+    _validation = {
+        "blob": {"readonly": True},
+        "queue": {"readonly": True},
+        "table": {"readonly": True},
+        "file": {"readonly": True},
+        "web": {"readonly": True},
+        "dfs": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "blob": {"key": "blob", "type": "str"},
+        "queue": {"key": "queue", "type": "str"},
+        "table": {"key": "table", "type": "str"},
+        "file": {"key": "file", "type": "str"},
+        "web": {"key": "web", "type": "str"},
+        "dfs": {"key": "dfs", "type": "str"},
+        "microsoft_endpoints": {"key": "microsoftEndpoints", "type": "StorageAccountMicrosoftEndpoints"},
+        "internet_endpoints": {"key": "internetEndpoints", "type": "StorageAccountInternetEndpoints"},
+    }
+
+    def __init__(
+        self,
+        *,
+        microsoft_endpoints: Optional["_models.StorageAccountMicrosoftEndpoints"] = None,
+        internet_endpoints: Optional["_models.StorageAccountInternetEndpoints"] = None,
+        **kwargs: Any
+    ) -> None:
+        """
+        :keyword microsoft_endpoints: Gets the microsoft routing storage endpoints.
+        :paramtype microsoft_endpoints:
+         ~azure.mgmt.storage.v2024_01_01.models.StorageAccountMicrosoftEndpoints
+        :keyword internet_endpoints: Gets the internet routing storage endpoints.
+        :paramtype internet_endpoints:
+         ~azure.mgmt.storage.v2024_01_01.models.StorageAccountInternetEndpoints
+        """
+        super().__init__(**kwargs)
+        self.blob = None
+        self.queue = None
+        self.table = None
+        self.file = None
+        self.web = None
+        self.dfs = None
+        self.microsoft_endpoints = microsoft_endpoints
+        self.internet_endpoints = internet_endpoints
+
+
+class ErrorAdditionalInfo(_serialization.Model):
+    """The resource management error additional info.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar type: The additional info type.
+    :vartype type: str
+    :ivar info: The additional info.
+    :vartype info: JSON
+    """
+
+    _validation = {
+        "type": {"readonly": True},
+        "info": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "type": {"key": "type", "type": "str"},
+        "info": {"key": "info", "type": "object"},
+    }
+
+    def __init__(self, **kwargs: Any) -> None:
+        """ """
+        super().__init__(**kwargs)
+        self.type = None
+        self.info = None
+
+
+class ErrorDetail(_serialization.Model):
+    """The error detail.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar code: The error code.
+    :vartype code: str
+    :ivar message: The error message.
+    :vartype message: str
+    :ivar target: The error target.
+    :vartype target: str
+    :ivar details: The error details.
+    :vartype details: list[~azure.mgmt.storage.v2024_01_01.models.ErrorDetail]
+    :ivar additional_info: The error additional info.
+    :vartype additional_info: list[~azure.mgmt.storage.v2024_01_01.models.ErrorAdditionalInfo]
+    """
+
+    _validation = {
+        "code": {"readonly": True},
+        "message": {"readonly": True},
+        "target": {"readonly": True},
+        "details": {"readonly": True},
+        "additional_info": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "code": {"key": "code", "type": "str"},
+        "message": {"key": "message", "type": "str"},
+        "target": {"key": "target", "type": "str"},
+        "details": {"key": "details", "type": "[ErrorDetail]"},
+        "additional_info": {"key": "additionalInfo", "type": "[ErrorAdditionalInfo]"},
+    }
+
+    def __init__(self, **kwargs: Any) -> None:
+        """ """
+        super().__init__(**kwargs)
+        self.code = None
+        self.message = None
+        self.target = None
+        self.details = None
+        self.additional_info = None
+
+
+class ErrorResponse(_serialization.Model):
+    """An error response from the storage resource provider.
+
+    :ivar error: Azure Storage Resource Provider error response body.
+    :vartype error: ~azure.mgmt.storage.v2024_01_01.models.ErrorResponseBody
+    """
+
+    _attribute_map = {
+        "error": {"key": "error", "type": "ErrorResponseBody"},
+    }
+
+    def __init__(self, *, error: Optional["_models.ErrorResponseBody"] = None, **kwargs: Any) -> None:
+        """
+        :keyword error: Azure Storage Resource Provider error response body.
+        :paramtype error: ~azure.mgmt.storage.v2024_01_01.models.ErrorResponseBody
+        """
+        super().__init__(**kwargs)
+        self.error = error
+
+
+class ErrorResponseAutoGenerated(_serialization.Model):
+    """Common error response for all Azure Resource Manager APIs to return error details for failed
+    operations. (This also follows the OData error response format.).
+
+    :ivar error: The error object.
+    :vartype error: ~azure.mgmt.storage.v2024_01_01.models.ErrorDetail
+    """
+
+    _attribute_map = {
+        "error": {"key": "error", "type": "ErrorDetail"},
+    }
+
+    def __init__(self, *, error: Optional["_models.ErrorDetail"] = None, **kwargs: Any) -> None:
+        """
+        :keyword error: The error object.
+        :paramtype error: ~azure.mgmt.storage.v2024_01_01.models.ErrorDetail
+        """
+        super().__init__(**kwargs)
+        self.error = error
+
+
+class ErrorResponseBody(_serialization.Model):
+    """Error response body contract.
+
+    :ivar code: An identifier for the error. Codes are invariant and are intended to be consumed
+     programmatically.
+    :vartype code: str
+    :ivar message: A message describing the error, intended to be suitable for display in a user
+     interface.
+    :vartype message: str
+    """
+
+    _attribute_map = {
+        "code": {"key": "code", "type": "str"},
+        "message": {"key": "message", "type": "str"},
+    }
+
+    def __init__(self, *, code: Optional[str] = None, message: Optional[str] = None, **kwargs: Any) -> None:
+        """
+        :keyword code: An identifier for the error. Codes are invariant and are intended to be consumed
+         programmatically.
+        :paramtype code: str
+        :keyword message: A message describing the error, intended to be suitable for display in a user
+         interface.
+        :paramtype message: str
+        """
+        super().__init__(**kwargs)
+        self.code = code
+        self.message = message
+
+
+class ExecutionTarget(_serialization.Model):
+    """Target helps provide filter parameters for the objects in the storage account and forms the
+    execution context for the storage task.
+
+    :ivar prefix: Required list of object prefixes to be included for task execution.
+    :vartype prefix: list[str]
+    :ivar exclude_prefix: List of object prefixes to be excluded from task execution. If there is a
+     conflict between include and exclude prefixes, the exclude prefix will be the determining
+     factor.
+    :vartype exclude_prefix: list[str]
+    """
+
+    _attribute_map = {
+        "prefix": {"key": "prefix", "type": "[str]"},
+        "exclude_prefix": {"key": "excludePrefix", "type": "[str]"},
+    }
+
+    def __init__(
+        self, *, prefix: Optional[List[str]] = None, exclude_prefix: Optional[List[str]] = None, **kwargs: Any
+    ) -> None:
+        """
+        :keyword prefix: Required list of object prefixes to be included for task execution.
+        :paramtype prefix: list[str]
+        :keyword exclude_prefix: List of object prefixes to be excluded from task execution. If there
+         is a conflict between include and exclude prefixes, the exclude prefix will be the determining
+         factor.
+        :paramtype exclude_prefix: list[str]
+        """
+        super().__init__(**kwargs)
+        self.prefix = prefix
+        self.exclude_prefix = exclude_prefix
+
+
+class ExecutionTrigger(_serialization.Model):
+    """Execution trigger for storage task assignment.
+
+    All required parameters must be populated in order to send to server.
+
+    :ivar type: The trigger type of the storage task assignment execution. Required. Known values
+     are: "RunOnce" and "OnSchedule".
+    :vartype type: str or ~azure.mgmt.storage.v2024_01_01.models.TriggerType
+    :ivar parameters: The trigger parameters of the storage task assignment execution. Required.
+    :vartype parameters: ~azure.mgmt.storage.v2024_01_01.models.TriggerParameters
+    """
+
+    _validation = {
+        "type": {"required": True},
+        "parameters": {"required": True},
+    }
+
+    _attribute_map = {
+        "type": {"key": "type", "type": "str"},
+        "parameters": {"key": "parameters", "type": "TriggerParameters"},
+    }
+
+    def __init__(
+        self, *, type: Union[str, "_models.TriggerType"], parameters: "_models.TriggerParameters", **kwargs: Any
+    ) -> None:
+        """
+        :keyword type: The trigger type of the storage task assignment execution. Required. Known
+         values are: "RunOnce" and "OnSchedule".
+        :paramtype type: str or ~azure.mgmt.storage.v2024_01_01.models.TriggerType
+        :keyword parameters: The trigger parameters of the storage task assignment execution. Required.
+        :paramtype parameters: ~azure.mgmt.storage.v2024_01_01.models.TriggerParameters
+        """
+        super().__init__(**kwargs)
+        self.type = type
+        self.parameters = parameters
+
+
+class ExecutionTriggerUpdate(_serialization.Model):
+    """Execution trigger update for storage task assignment.
+
+    :ivar type: The trigger type of the storage task assignment execution. Known values are:
+     "RunOnce" and "OnSchedule".
+    :vartype type: str or ~azure.mgmt.storage.v2024_01_01.models.TriggerType
+    :ivar parameters: The trigger parameters of the storage task assignment execution.
+    :vartype parameters: ~azure.mgmt.storage.v2024_01_01.models.TriggerParametersUpdate
+    """
+
+    _attribute_map = {
+        "type": {"key": "type", "type": "str"},
+        "parameters": {"key": "parameters", "type": "TriggerParametersUpdate"},
+    }
+
+    def __init__(
+        self,
+        *,
+        type: Optional[Union[str, "_models.TriggerType"]] = None,
+        parameters: Optional["_models.TriggerParametersUpdate"] = None,
+        **kwargs: Any
+    ) -> None:
+        """
+        :keyword type: The trigger type of the storage task assignment execution. Known values are:
+         "RunOnce" and "OnSchedule".
+        :paramtype type: str or ~azure.mgmt.storage.v2024_01_01.models.TriggerType
+        :keyword parameters: The trigger parameters of the storage task assignment execution.
+        :paramtype parameters: ~azure.mgmt.storage.v2024_01_01.models.TriggerParametersUpdate
+        """
+        super().__init__(**kwargs)
+        self.type = type
+        self.parameters = parameters
+
+
+class ExtendedLocation(_serialization.Model):
+    """The complex type of the extended location.
+
+    :ivar name: The name of the extended location.
+    :vartype name: str
+    :ivar type: The type of the extended location. "EdgeZone"
+    :vartype type: str or ~azure.mgmt.storage.v2024_01_01.models.ExtendedLocationTypes
+    """
+
+    _attribute_map = {
+        "name": {"key": "name", "type": "str"},
+        "type": {"key": "type", "type": "str"},
+    }
+
+    def __init__(
+        self,
+        *,
+        name: Optional[str] = None,
+        type: Optional[Union[str, "_models.ExtendedLocationTypes"]] = None,
+        **kwargs: Any
+    ) -> None:
+        """
+        :keyword name: The name of the extended location.
+        :paramtype name: str
+        :keyword type: The type of the extended location. "EdgeZone"
+        :paramtype type: str or ~azure.mgmt.storage.v2024_01_01.models.ExtendedLocationTypes
+        """
+        super().__init__(**kwargs)
+        self.name = name
+        self.type = type
+
+
+class FileServiceItems(_serialization.Model):
+    """FileServiceItems.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar value: List of file services returned.
+    :vartype value: list[~azure.mgmt.storage.v2024_01_01.models.FileServiceProperties]
+    """
+
+    _validation = {
+        "value": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "value": {"key": "value", "type": "[FileServiceProperties]"},
+    }
+
+    def __init__(self, **kwargs: Any) -> None:
+        """ """
+        super().__init__(**kwargs)
+        self.value = None
+
+
+class FileServiceProperties(Resource):
+    """The properties of File services in storage account.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar id: Fully qualified resource ID for the resource. Ex -
+     /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}.  # pylint: disable=line-too-long
+    :vartype id: str
+    :ivar name: The name of the resource.
+    :vartype name: str
+    :ivar type: The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or
+     "Microsoft.Storage/storageAccounts".
+    :vartype type: str
+    :ivar sku: Sku name and tier.
+    :vartype sku: ~azure.mgmt.storage.v2024_01_01.models.Sku
+    :ivar cors: Specifies CORS rules for the File service. You can include up to five CorsRule
+     elements in the request. If no CorsRule elements are included in the request body, all CORS
+     rules will be deleted, and CORS will be disabled for the File service.
+    :vartype cors: ~azure.mgmt.storage.v2024_01_01.models.CorsRules
+    :ivar share_delete_retention_policy: The file service properties for share soft delete.
+    :vartype share_delete_retention_policy:
+     ~azure.mgmt.storage.v2024_01_01.models.DeleteRetentionPolicy
+    :ivar protocol_settings: Protocol settings for file service.
+    :vartype protocol_settings: ~azure.mgmt.storage.v2024_01_01.models.ProtocolSettings
+    """
+
+    _validation = {
+        "id": {"readonly": True},
+        "name": {"readonly": True},
+        "type": {"readonly": True},
+        "sku": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "id": {"key": "id", "type": "str"},
+        "name": {"key": "name", "type": "str"},
+        "type": {"key": "type", "type": "str"},
+        "sku": {"key": "sku", "type": "Sku"},
+        "cors": {"key": "properties.cors", "type": "CorsRules"},
+        "share_delete_retention_policy": {
+            "key": "properties.shareDeleteRetentionPolicy",
+            "type": "DeleteRetentionPolicy",
+        },
+        "protocol_settings": {"key": "properties.protocolSettings", "type": "ProtocolSettings"},
+    }
+
+    def __init__(
+        self,
+        *,
+        cors: Optional["_models.CorsRules"] = None,
+        share_delete_retention_policy: Optional["_models.DeleteRetentionPolicy"] = None,
+        protocol_settings: Optional["_models.ProtocolSettings"] = None,
+        **kwargs: Any
+    ) -> None:
+        """
+        :keyword cors: Specifies CORS rules for the File service. You can include up to five CorsRule
+         elements in the request. If no CorsRule elements are included in the request body, all CORS
+         rules will be deleted, and CORS will be disabled for the File service.
+        :paramtype cors: ~azure.mgmt.storage.v2024_01_01.models.CorsRules
+        :keyword share_delete_retention_policy: The file service properties for share soft delete.
+        :paramtype share_delete_retention_policy:
+         ~azure.mgmt.storage.v2024_01_01.models.DeleteRetentionPolicy
+        :keyword protocol_settings: Protocol settings for file service.
+        :paramtype protocol_settings: ~azure.mgmt.storage.v2024_01_01.models.ProtocolSettings
+        """
+        super().__init__(**kwargs)
+        self.sku = None
+        self.cors = cors
+        self.share_delete_retention_policy = share_delete_retention_policy
+        self.protocol_settings = protocol_settings
+
+
+class FileServiceUsage(Resource):
+    """The usage of file service in storage account.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar id: Fully qualified resource ID for the resource. Ex -
+     /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}.  # pylint: disable=line-too-long
+    :vartype id: str
+    :ivar name: The name of the resource.
+    :vartype name: str
+    :ivar type: The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or
+     "Microsoft.Storage/storageAccounts".
+    :vartype type: str
+    :ivar properties: File service usage in storage account including account limits, file share
+     limits and constants used in recommendations and bursting formula.
+    :vartype properties: ~azure.mgmt.storage.v2024_01_01.models.FileServiceUsageProperties
+    """
+
+    _validation = {
+        "id": {"readonly": True},
+        "name": {"readonly": True},
+        "type": {"readonly": True},
+        "properties": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "id": {"key": "id", "type": "str"},
+        "name": {"key": "name", "type": "str"},
+        "type": {"key": "type", "type": "str"},
+        "properties": {"key": "properties", "type": "FileServiceUsageProperties"},
+    }
+
+    def __init__(self, **kwargs: Any) -> None:
+        """ """
+        super().__init__(**kwargs)
+        self.properties = None
+
+
+class FileServiceUsageProperties(_serialization.Model):
+    """File service usage in storage account including account limits, file share limits and constants
+    used in recommendations and bursting formula.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar storage_account_limits: Maximum provisioned storage, IOPS, bandwidth and number of file
+     shares limits for the storage account.
+    :vartype storage_account_limits: ~azure.mgmt.storage.v2024_01_01.models.AccountLimits
+    :ivar file_share_limits: Minimum and maximum provisioned storage, IOPS and bandwidth limits for
+     a file share in the storage account.
+    :vartype file_share_limits: ~azure.mgmt.storage.v2024_01_01.models.FileShareLimits
+    :ivar file_share_recommendations: Constants used for calculating recommended provisioned IOPS
+     and bandwidth for a file share in the storage account.
+    :vartype file_share_recommendations:
+     ~azure.mgmt.storage.v2024_01_01.models.FileShareRecommendations
+    :ivar bursting_constants: Constants used for calculating included burst IOPS and maximum burst
+     credits for IOPS for a file share in the storage account.
+    :vartype bursting_constants: ~azure.mgmt.storage.v2024_01_01.models.BurstingConstants
+    :ivar storage_account_usage: Usage of provisioned storage, IOPS, bandwidth and number of file
+     shares across all live shares and soft-deleted shares in the account.
+    :vartype storage_account_usage: ~azure.mgmt.storage.v2024_01_01.models.AccountUsage
+    """
+
+    _validation = {
+        "storage_account_limits": {"readonly": True},
+        "file_share_limits": {"readonly": True},
+        "file_share_recommendations": {"readonly": True},
+        "bursting_constants": {"readonly": True},
+        "storage_account_usage": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "storage_account_limits": {"key": "storageAccountLimits", "type": "AccountLimits"},
+        "file_share_limits": {"key": "fileShareLimits", "type": "FileShareLimits"},
+        "file_share_recommendations": {"key": "fileShareRecommendations", "type": "FileShareRecommendations"},
+        "bursting_constants": {"key": "burstingConstants", "type": "BurstingConstants"},
+        "storage_account_usage": {"key": "storageAccountUsage", "type": "AccountUsage"},
+    }
+
+    def __init__(self, **kwargs: Any) -> None:
+        """ """
+        super().__init__(**kwargs)
+        self.storage_account_limits = None
+        self.file_share_limits = None
+        self.file_share_recommendations = None
+        self.bursting_constants = None
+        self.storage_account_usage = None
+
+
+class FileServiceUsages(_serialization.Model):
+    """List file service usages schema.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar value: List of file service usages returned.
+    :vartype value: list[~azure.mgmt.storage.v2024_01_01.models.FileServiceUsage]
+    :ivar next_link: Request URL that can be used to query next page of file service usages.
+     Returned when total number of requested file service usages exceed maximum page size.
+    :vartype next_link: str
+    """
+
+    _validation = {
+        "value": {"readonly": True},
+        "next_link": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "value": {"key": "value", "type": "[FileServiceUsage]"},
+        "next_link": {"key": "nextLink", "type": "str"},
+    }
+
+    def __init__(self, **kwargs: Any) -> None:
+        """ """
+        super().__init__(**kwargs)
+        self.value = None
+        self.next_link = None
+
+
+class FileShare(AzureEntityResource):
+    """Properties of the file share, including Id, resource name, resource type, Etag.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar id: Fully qualified resource ID for the resource. Ex -
+     /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}.  # pylint: disable=line-too-long
+    :vartype id: str
+    :ivar name: The name of the resource.
+    :vartype name: str
+    :ivar type: The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or
+     "Microsoft.Storage/storageAccounts".
+    :vartype type: str
+    :ivar etag: Resource Etag.
+    :vartype etag: str
+    :ivar last_modified_time: Returns the date and time the share was last modified.
+    :vartype last_modified_time: ~datetime.datetime
+    :ivar metadata: A name-value pair to associate with the share as metadata.
+    :vartype metadata: dict[str, str]
+    :ivar share_quota: The provisioned size of the share, in gibibytes. Must be greater than 0, and
+     less than or equal to 5TB (5120). For Large File Shares, the maximum size is 102400. For file
+     shares created under Files Provisioned v2 account type, please refer to the GetFileServiceUsage
+     API response for the minimum and maximum allowed provisioned storage size.
+    :vartype share_quota: int
+    :ivar provisioned_iops: The provisioned IOPS of the share. This property is only for file
+     shares created under Files Provisioned v2 account type. Please refer to the GetFileServiceUsage
+     API response for the minimum and maximum allowed value for provisioned IOPS.
+    :vartype provisioned_iops: int
+    :ivar provisioned_bandwidth_mibps: The provisioned bandwidth of the share, in mebibytes per
+     second. This property is only for file shares created under Files Provisioned v2 account type.
+     Please refer to the GetFileServiceUsage API response for the minimum and maximum allowed value
+     for provisioned bandwidth.
+    :vartype provisioned_bandwidth_mibps: int
+    :ivar included_burst_iops: The calculated burst IOPS of the share. This property is only for
+     file shares created under Files Provisioned v2 account type.
+    :vartype included_burst_iops: int
+    :ivar max_burst_credits_for_iops: The calculated maximum burst credits for the share. This
+     property is only for file shares created under Files Provisioned v2 account type.
+    :vartype max_burst_credits_for_iops: int
+    :ivar next_allowed_quota_downgrade_time: Returns the next allowed provisioned storage size
+     downgrade time for the share. This property is only for file shares created under Files
+     Provisioned v1 SSD and Files Provisioned v2 account type.
+    :vartype next_allowed_quota_downgrade_time: ~datetime.datetime
+    :ivar next_allowed_provisioned_iops_downgrade_time: Returns the next allowed provisioned IOPS
+     downgrade time for the share. This property is only for file shares created under Files
+     Provisioned v2 account type.
+    :vartype next_allowed_provisioned_iops_downgrade_time: ~datetime.datetime
+    :ivar next_allowed_provisioned_bandwidth_downgrade_time: Returns the next allowed provisioned
+     bandwidth downgrade time for the share. This property is only for file shares created under
+     Files Provisioned v2 account type.
+    :vartype next_allowed_provisioned_bandwidth_downgrade_time: ~datetime.datetime
+    :ivar enabled_protocols: The authentication protocol that is used for the file share. Can only
+     be specified when creating a share. Known values are: "SMB" and "NFS".
+    :vartype enabled_protocols: str or ~azure.mgmt.storage.v2024_01_01.models.EnabledProtocols
+    :ivar root_squash: The property is for NFS share only. The default is NoRootSquash. Known
+     values are: "NoRootSquash", "RootSquash", and "AllSquash".
+    :vartype root_squash: str or ~azure.mgmt.storage.v2024_01_01.models.RootSquashType
+    :ivar version: The version of the share.
+    :vartype version: str
+    :ivar deleted: Indicates whether the share was deleted.
+    :vartype deleted: bool
+    :ivar deleted_time: The deleted time if the share was deleted.
+    :vartype deleted_time: ~datetime.datetime
+    :ivar remaining_retention_days: Remaining retention days for share that was soft deleted.
+    :vartype remaining_retention_days: int
+    :ivar access_tier: Access tier for specific share. GpV2 account can choose between
+     TransactionOptimized (default), Hot, and Cool. FileStorage account can choose Premium. Known
+     values are: "TransactionOptimized", "Hot", "Cool", and "Premium".
+    :vartype access_tier: str or ~azure.mgmt.storage.v2024_01_01.models.ShareAccessTier
+    :ivar access_tier_change_time: Indicates the last modification time for share access tier.
+    :vartype access_tier_change_time: ~datetime.datetime
+    :ivar access_tier_status: Indicates if there is a pending transition for access tier.
+    :vartype access_tier_status: str
+    :ivar share_usage_bytes: The approximate size of the data stored on the share. Note that this
+     value may not include all recently created or recently resized files.
+    :vartype share_usage_bytes: int
+    :ivar lease_status: The lease status of the share. Known values are: "Locked" and "Unlocked".
+    :vartype lease_status: str or ~azure.mgmt.storage.v2024_01_01.models.LeaseStatus
+    :ivar lease_state: Lease state of the share. Known values are: "Available", "Leased",
+     "Expired", "Breaking", and "Broken".
+    :vartype lease_state: str or ~azure.mgmt.storage.v2024_01_01.models.LeaseState
+    :ivar lease_duration: Specifies whether the lease on a share is of infinite or fixed duration,
+     only when the share is leased. Known values are: "Infinite" and "Fixed".
+    :vartype lease_duration: str or ~azure.mgmt.storage.v2024_01_01.models.LeaseDuration
+    :ivar signed_identifiers: List of stored access policies specified on the share.
+    :vartype signed_identifiers: list[~azure.mgmt.storage.v2024_01_01.models.SignedIdentifier]
+    :ivar snapshot_time: Creation time of share snapshot returned in the response of list shares
+     with expand param "snapshots".
+    :vartype snapshot_time: ~datetime.datetime
+    :ivar file_share_paid_bursting: File Share Paid Bursting properties.
+    :vartype file_share_paid_bursting:
+     ~azure.mgmt.storage.v2024_01_01.models.FileSharePropertiesFileSharePaidBursting
+    """
+
+    _validation = {
+        "id": {"readonly": True},
+        "name": {"readonly": True},
+        "type": {"readonly": True},
+        "etag": {"readonly": True},
+        "last_modified_time": {"readonly": True},
+        "included_burst_iops": {"readonly": True},
+        "max_burst_credits_for_iops": {"readonly": True},
+        "next_allowed_quota_downgrade_time": {"readonly": True},
+        "next_allowed_provisioned_iops_downgrade_time": {"readonly": True},
+        "next_allowed_provisioned_bandwidth_downgrade_time": {"readonly": True},
+        "version": {"readonly": True},
+        "deleted": {"readonly": True},
+        "deleted_time": {"readonly": True},
+        "remaining_retention_days": {"readonly": True},
+        "access_tier_change_time": {"readonly": True},
+        "access_tier_status": {"readonly": True},
+        "share_usage_bytes": {"readonly": True},
+        "lease_status": {"readonly": True},
+        "lease_state": {"readonly": True},
+        "lease_duration": {"readonly": True},
+        "snapshot_time": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "id": {"key": "id", "type": "str"},
+        "name": {"key": "name", "type": "str"},
+        "type": {"key": "type", "type": "str"},
+        "etag": {"key": "etag", "type": "str"},
+        "last_modified_time": {"key": "properties.lastModifiedTime", "type": "iso-8601"},
+        "metadata": {"key": "properties.metadata", "type": "{str}"},
+        "share_quota": {"key": "properties.shareQuota", "type": "int"},
+        "provisioned_iops": {"key": "properties.provisionedIops", "type": "int"},
+        "provisioned_bandwidth_mibps": {"key": "properties.provisionedBandwidthMibps", "type": "int"},
+        "included_burst_iops": {"key": "properties.includedBurstIops", "type": "int"},
+        "max_burst_credits_for_iops": {"key": "properties.maxBurstCreditsForIops", "type": "int"},
+        "next_allowed_quota_downgrade_time": {"key": "properties.nextAllowedQuotaDowngradeTime", "type": "iso-8601"},
+        "next_allowed_provisioned_iops_downgrade_time": {
+            "key": "properties.nextAllowedProvisionedIopsDowngradeTime",
+            "type": "iso-8601",
+        },
+        "next_allowed_provisioned_bandwidth_downgrade_time": {
+            "key": "properties.nextAllowedProvisionedBandwidthDowngradeTime",
+            "type": "iso-8601",
+        },
+        "enabled_protocols": {"key": "properties.enabledProtocols", "type": "str"},
+        "root_squash": {"key": "properties.rootSquash", "type": "str"},
+        "version": {"key": "properties.version", "type": "str"},
+        "deleted": {"key": "properties.deleted", "type": "bool"},
+        "deleted_time": {"key": "properties.deletedTime", "type": "iso-8601"},
+        "remaining_retention_days": {"key": "properties.remainingRetentionDays", "type": "int"},
+        "access_tier": {"key": "properties.accessTier", "type": "str"},
+        "access_tier_change_time": {"key": "properties.accessTierChangeTime", "type": "iso-8601"},
+        "access_tier_status": {"key": "properties.accessTierStatus", "type": "str"},
+        "share_usage_bytes": {"key": "properties.shareUsageBytes", "type": "int"},
+        "lease_status": {"key": "properties.leaseStatus", "type": "str"},
+        "lease_state": {"key": "properties.leaseState", "type": "str"},
+        "lease_duration": {"key": "properties.leaseDuration", "type": "str"},
+        "signed_identifiers": {"key": "properties.signedIdentifiers", "type": "[SignedIdentifier]"},
+        "snapshot_time": {"key": "properties.snapshotTime", "type": "iso-8601"},
+        "file_share_paid_bursting": {
+            "key": "properties.fileSharePaidBursting",
+            "type": "FileSharePropertiesFileSharePaidBursting",
+        },
+    }
+
+    def __init__(  # pylint: disable=too-many-locals
+        self,
+        *,
+        metadata: Optional[Dict[str, str]] = None,
+        share_quota: Optional[int] = None,
+        provisioned_iops: Optional[int] = None,
+        provisioned_bandwidth_mibps: Optional[int] = None,
+        enabled_protocols: Optional[Union[str, "_models.EnabledProtocols"]] = None,
+        root_squash: Optional[Union[str, "_models.RootSquashType"]] = None,
+        access_tier: Optional[Union[str, "_models.ShareAccessTier"]] = None,
+        signed_identifiers: Optional[List["_models.SignedIdentifier"]] = None,
+        file_share_paid_bursting: Optional["_models.FileSharePropertiesFileSharePaidBursting"] = None,
+        **kwargs: Any
+    ) -> None:
+        """
+        :keyword metadata: A name-value pair to associate with the share as metadata.
+        :paramtype metadata: dict[str, str]
+        :keyword share_quota: The provisioned size of the share, in gibibytes. Must be greater than 0,
+         and less than or equal to 5TB (5120). For Large File Shares, the maximum size is 102400. For
+         file shares created under Files Provisioned v2 account type, please refer to the
+         GetFileServiceUsage API response for the minimum and maximum allowed provisioned storage size.
+        :paramtype share_quota: int
+        :keyword provisioned_iops: The provisioned IOPS of the share. This property is only for file
+         shares created under Files Provisioned v2 account type. Please refer to the GetFileServiceUsage
+         API response for the minimum and maximum allowed value for provisioned IOPS.
+        :paramtype provisioned_iops: int
+        :keyword provisioned_bandwidth_mibps: The provisioned bandwidth of the share, in mebibytes per
+         second. This property is only for file shares created under Files Provisioned v2 account type.
+         Please refer to the GetFileServiceUsage API response for the minimum and maximum allowed value
+         for provisioned bandwidth.
+        :paramtype provisioned_bandwidth_mibps: int
+        :keyword enabled_protocols: The authentication protocol that is used for the file share. Can
+         only be specified when creating a share. Known values are: "SMB" and "NFS".
+        :paramtype enabled_protocols: str or ~azure.mgmt.storage.v2024_01_01.models.EnabledProtocols
+        :keyword root_squash: The property is for NFS share only. The default is NoRootSquash. Known
+         values are: "NoRootSquash", "RootSquash", and "AllSquash".
+        :paramtype root_squash: str or ~azure.mgmt.storage.v2024_01_01.models.RootSquashType
+        :keyword access_tier: Access tier for specific share. GpV2 account can choose between
+         TransactionOptimized (default), Hot, and Cool. FileStorage account can choose Premium. Known
+         values are: "TransactionOptimized", "Hot", "Cool", and "Premium".
+        :paramtype access_tier: str or ~azure.mgmt.storage.v2024_01_01.models.ShareAccessTier
+        :keyword signed_identifiers: List of stored access policies specified on the share.
+        :paramtype signed_identifiers: list[~azure.mgmt.storage.v2024_01_01.models.SignedIdentifier]
+        :keyword file_share_paid_bursting: File Share Paid Bursting properties.
+        :paramtype file_share_paid_bursting:
+         ~azure.mgmt.storage.v2024_01_01.models.FileSharePropertiesFileSharePaidBursting
+        """
+        super().__init__(**kwargs)
+        self.last_modified_time = None
+        self.metadata = metadata
+        self.share_quota = share_quota
+        self.provisioned_iops = provisioned_iops
+        self.provisioned_bandwidth_mibps = provisioned_bandwidth_mibps
+        self.included_burst_iops = None
+        self.max_burst_credits_for_iops = None
+        self.next_allowed_quota_downgrade_time = None
+        self.next_allowed_provisioned_iops_downgrade_time = None
+        self.next_allowed_provisioned_bandwidth_downgrade_time = None
+        self.enabled_protocols = enabled_protocols
+        self.root_squash = root_squash
+        self.version = None
+        self.deleted = None
+        self.deleted_time = None
+        self.remaining_retention_days = None
+        self.access_tier = access_tier
+        self.access_tier_change_time = None
+        self.access_tier_status = None
+        self.share_usage_bytes = None
+        self.lease_status = None
+        self.lease_state = None
+        self.lease_duration = None
+        self.signed_identifiers = signed_identifiers
+        self.snapshot_time = None
+        self.file_share_paid_bursting = file_share_paid_bursting
+
+
+class FileShareItem(AzureEntityResource):
+    """The file share properties be listed out.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar id: Fully qualified resource ID for the resource. Ex -
+     /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}.  # pylint: disable=line-too-long
+    :vartype id: str
+    :ivar name: The name of the resource.
+    :vartype name: str
+    :ivar type: The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or
+     "Microsoft.Storage/storageAccounts".
+    :vartype type: str
+    :ivar etag: Resource Etag.
+    :vartype etag: str
+    :ivar last_modified_time: Returns the date and time the share was last modified.
+    :vartype last_modified_time: ~datetime.datetime
+    :ivar metadata: A name-value pair to associate with the share as metadata.
+    :vartype metadata: dict[str, str]
+    :ivar share_quota: The provisioned size of the share, in gibibytes. Must be greater than 0, and
+     less than or equal to 5TB (5120). For Large File Shares, the maximum size is 102400. For file
+     shares created under Files Provisioned v2 account type, please refer to the GetFileServiceUsage
+     API response for the minimum and maximum allowed provisioned storage size.
+    :vartype share_quota: int
+    :ivar provisioned_iops: The provisioned IOPS of the share. This property is only for file
+     shares created under Files Provisioned v2 account type. Please refer to the GetFileServiceUsage
+     API response for the minimum and maximum allowed value for provisioned IOPS.
+    :vartype provisioned_iops: int
+    :ivar provisioned_bandwidth_mibps: The provisioned bandwidth of the share, in mebibytes per
+     second. This property is only for file shares created under Files Provisioned v2 account type.
+     Please refer to the GetFileServiceUsage API response for the minimum and maximum allowed value
+     for provisioned bandwidth.
+    :vartype provisioned_bandwidth_mibps: int
+    :ivar included_burst_iops: The calculated burst IOPS of the share. This property is only for
+     file shares created under Files Provisioned v2 account type.
+    :vartype included_burst_iops: int
+    :ivar max_burst_credits_for_iops: The calculated maximum burst credits for the share. This
+     property is only for file shares created under Files Provisioned v2 account type.
+    :vartype max_burst_credits_for_iops: int
+    :ivar next_allowed_quota_downgrade_time: Returns the next allowed provisioned storage size
+     downgrade time for the share. This property is only for file shares created under Files
+     Provisioned v1 SSD and Files Provisioned v2 account type.
+    :vartype next_allowed_quota_downgrade_time: ~datetime.datetime
+    :ivar next_allowed_provisioned_iops_downgrade_time: Returns the next allowed provisioned IOPS
+     downgrade time for the share. This property is only for file shares created under Files
+     Provisioned v2 account type.
+    :vartype next_allowed_provisioned_iops_downgrade_time: ~datetime.datetime
+    :ivar next_allowed_provisioned_bandwidth_downgrade_time: Returns the next allowed provisioned
+     bandwidth downgrade time for the share. This property is only for file shares created under
+     Files Provisioned v2 account type.
+    :vartype next_allowed_provisioned_bandwidth_downgrade_time: ~datetime.datetime
+    :ivar enabled_protocols: The authentication protocol that is used for the file share. Can only
+     be specified when creating a share. Known values are: "SMB" and "NFS".
+    :vartype enabled_protocols: str or ~azure.mgmt.storage.v2024_01_01.models.EnabledProtocols
+    :ivar root_squash: The property is for NFS share only. The default is NoRootSquash. Known
+     values are: "NoRootSquash", "RootSquash", and "AllSquash".
+    :vartype root_squash: str or ~azure.mgmt.storage.v2024_01_01.models.RootSquashType
+    :ivar version: The version of the share.
+    :vartype version: str
+    :ivar deleted: Indicates whether the share was deleted.
+    :vartype deleted: bool
+    :ivar deleted_time: The deleted time if the share was deleted.
+    :vartype deleted_time: ~datetime.datetime
+    :ivar remaining_retention_days: Remaining retention days for share that was soft deleted.
+    :vartype remaining_retention_days: int
+    :ivar access_tier: Access tier for specific share. GpV2 account can choose between
+     TransactionOptimized (default), Hot, and Cool. FileStorage account can choose Premium. Known
+     values are: "TransactionOptimized", "Hot", "Cool", and "Premium".
+    :vartype access_tier: str or ~azure.mgmt.storage.v2024_01_01.models.ShareAccessTier
+    :ivar access_tier_change_time: Indicates the last modification time for share access tier.
+    :vartype access_tier_change_time: ~datetime.datetime
+    :ivar access_tier_status: Indicates if there is a pending transition for access tier.
+    :vartype access_tier_status: str
+    :ivar share_usage_bytes: The approximate size of the data stored on the share. Note that this
+     value may not include all recently created or recently resized files.
+    :vartype share_usage_bytes: int
+    :ivar lease_status: The lease status of the share. Known values are: "Locked" and "Unlocked".
+    :vartype lease_status: str or ~azure.mgmt.storage.v2024_01_01.models.LeaseStatus
+    :ivar lease_state: Lease state of the share. Known values are: "Available", "Leased",
+     "Expired", "Breaking", and "Broken".
+    :vartype lease_state: str or ~azure.mgmt.storage.v2024_01_01.models.LeaseState
+    :ivar lease_duration: Specifies whether the lease on a share is of infinite or fixed duration,
+     only when the share is leased. Known values are: "Infinite" and "Fixed".
+    :vartype lease_duration: str or ~azure.mgmt.storage.v2024_01_01.models.LeaseDuration
+    :ivar signed_identifiers: List of stored access policies specified on the share.
+    :vartype signed_identifiers: list[~azure.mgmt.storage.v2024_01_01.models.SignedIdentifier]
+    :ivar snapshot_time: Creation time of share snapshot returned in the response of list shares
+     with expand param "snapshots".
+    :vartype snapshot_time: ~datetime.datetime
+    :ivar file_share_paid_bursting: File Share Paid Bursting properties.
+    :vartype file_share_paid_bursting:
+     ~azure.mgmt.storage.v2024_01_01.models.FileSharePropertiesFileSharePaidBursting
+    """
+
+    _validation = {
+        "id": {"readonly": True},
+        "name": {"readonly": True},
+        "type": {"readonly": True},
+        "etag": {"readonly": True},
+        "last_modified_time": {"readonly": True},
+        "included_burst_iops": {"readonly": True},
+        "max_burst_credits_for_iops": {"readonly": True},
+        "next_allowed_quota_downgrade_time": {"readonly": True},
+        "next_allowed_provisioned_iops_downgrade_time": {"readonly": True},
+        "next_allowed_provisioned_bandwidth_downgrade_time": {"readonly": True},
+        "version": {"readonly": True},
+        "deleted": {"readonly": True},
+        "deleted_time": {"readonly": True},
+        "remaining_retention_days": {"readonly": True},
+        "access_tier_change_time": {"readonly": True},
+        "access_tier_status": {"readonly": True},
+        "share_usage_bytes": {"readonly": True},
+        "lease_status": {"readonly": True},
+        "lease_state": {"readonly": True},
+        "lease_duration": {"readonly": True},
+        "snapshot_time": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "id": {"key": "id", "type": "str"},
+        "name": {"key": "name", "type": "str"},
+        "type": {"key": "type", "type": "str"},
+        "etag": {"key": "etag", "type": "str"},
+        "last_modified_time": {"key": "properties.lastModifiedTime", "type": "iso-8601"},
+        "metadata": {"key": "properties.metadata", "type": "{str}"},
+        "share_quota": {"key": "properties.shareQuota", "type": "int"},
+        "provisioned_iops": {"key": "properties.provisionedIops", "type": "int"},
+        "provisioned_bandwidth_mibps": {"key": "properties.provisionedBandwidthMibps", "type": "int"},
+        "included_burst_iops": {"key": "properties.includedBurstIops", "type": "int"},
+        "max_burst_credits_for_iops": {"key": "properties.maxBurstCreditsForIops", "type": "int"},
+        "next_allowed_quota_downgrade_time": {"key": "properties.nextAllowedQuotaDowngradeTime", "type": "iso-8601"},
+        "next_allowed_provisioned_iops_downgrade_time": {
+            "key": "properties.nextAllowedProvisionedIopsDowngradeTime",
+            "type": "iso-8601",
+        },
+        "next_allowed_provisioned_bandwidth_downgrade_time": {
+            "key": "properties.nextAllowedProvisionedBandwidthDowngradeTime",
+            "type": "iso-8601",
+        },
+        "enabled_protocols": {"key": "properties.enabledProtocols", "type": "str"},
+        "root_squash": {"key": "properties.rootSquash", "type": "str"},
+        "version": {"key": "properties.version", "type": "str"},
+        "deleted": {"key": "properties.deleted", "type": "bool"},
+        "deleted_time": {"key": "properties.deletedTime", "type": "iso-8601"},
+        "remaining_retention_days": {"key": "properties.remainingRetentionDays", "type": "int"},
+        "access_tier": {"key": "properties.accessTier", "type": "str"},
+        "access_tier_change_time": {"key": "properties.accessTierChangeTime", "type": "iso-8601"},
+        "access_tier_status": {"key": "properties.accessTierStatus", "type": "str"},
+        "share_usage_bytes": {"key": "properties.shareUsageBytes", "type": "int"},
+        "lease_status": {"key": "properties.leaseStatus", "type": "str"},
+        "lease_state": {"key": "properties.leaseState", "type": "str"},
+        "lease_duration": {"key": "properties.leaseDuration", "type": "str"},
+        "signed_identifiers": {"key": "properties.signedIdentifiers", "type": "[SignedIdentifier]"},
+        "snapshot_time": {"key": "properties.snapshotTime", "type": "iso-8601"},
+        "file_share_paid_bursting": {
+            "key": "properties.fileSharePaidBursting",
+            "type": "FileSharePropertiesFileSharePaidBursting",
+        },
+    }
+
+    def __init__(  # pylint: disable=too-many-locals
+        self,
+        *,
+        metadata: Optional[Dict[str, str]] = None,
+        share_quota: Optional[int] = None,
+        provisioned_iops: Optional[int] = None,
+        provisioned_bandwidth_mibps: Optional[int] = None,
+        enabled_protocols: Optional[Union[str, "_models.EnabledProtocols"]] = None,
+        root_squash: Optional[Union[str, "_models.RootSquashType"]] = None,
+        access_tier: Optional[Union[str, "_models.ShareAccessTier"]] = None,
+        signed_identifiers: Optional[List["_models.SignedIdentifier"]] = None,
+        file_share_paid_bursting: Optional["_models.FileSharePropertiesFileSharePaidBursting"] = None,
+        **kwargs: Any
+    ) -> None:
+        """
+        :keyword metadata: A name-value pair to associate with the share as metadata.
+        :paramtype metadata: dict[str, str]
+        :keyword share_quota: The provisioned size of the share, in gibibytes. Must be greater than 0,
+         and less than or equal to 5TB (5120). For Large File Shares, the maximum size is 102400. For
+         file shares created under Files Provisioned v2 account type, please refer to the
+         GetFileServiceUsage API response for the minimum and maximum allowed provisioned storage size.
+        :paramtype share_quota: int
+        :keyword provisioned_iops: The provisioned IOPS of the share. This property is only for file
+         shares created under Files Provisioned v2 account type. Please refer to the GetFileServiceUsage
+         API response for the minimum and maximum allowed value for provisioned IOPS.
+        :paramtype provisioned_iops: int
+        :keyword provisioned_bandwidth_mibps: The provisioned bandwidth of the share, in mebibytes per
+         second. This property is only for file shares created under Files Provisioned v2 account type.
+         Please refer to the GetFileServiceUsage API response for the minimum and maximum allowed value
+         for provisioned bandwidth.
+        :paramtype provisioned_bandwidth_mibps: int
+        :keyword enabled_protocols: The authentication protocol that is used for the file share. Can
+         only be specified when creating a share. Known values are: "SMB" and "NFS".
+        :paramtype enabled_protocols: str or ~azure.mgmt.storage.v2024_01_01.models.EnabledProtocols
+        :keyword root_squash: The property is for NFS share only. The default is NoRootSquash. Known
+         values are: "NoRootSquash", "RootSquash", and "AllSquash".
+        :paramtype root_squash: str or ~azure.mgmt.storage.v2024_01_01.models.RootSquashType
+        :keyword access_tier: Access tier for specific share. GpV2 account can choose between
+         TransactionOptimized (default), Hot, and Cool. FileStorage account can choose Premium. Known
+         values are: "TransactionOptimized", "Hot", "Cool", and "Premium".
+        :paramtype access_tier: str or ~azure.mgmt.storage.v2024_01_01.models.ShareAccessTier
+        :keyword signed_identifiers: List of stored access policies specified on the share.
+        :paramtype signed_identifiers: list[~azure.mgmt.storage.v2024_01_01.models.SignedIdentifier]
+        :keyword file_share_paid_bursting: File Share Paid Bursting properties.
+        :paramtype file_share_paid_bursting:
+         ~azure.mgmt.storage.v2024_01_01.models.FileSharePropertiesFileSharePaidBursting
+        """
+        super().__init__(**kwargs)
+        self.last_modified_time = None
+        self.metadata = metadata
+        self.share_quota = share_quota
+        self.provisioned_iops = provisioned_iops
+        self.provisioned_bandwidth_mibps = provisioned_bandwidth_mibps
+        self.included_burst_iops = None
+        self.max_burst_credits_for_iops = None
+        self.next_allowed_quota_downgrade_time = None
+        self.next_allowed_provisioned_iops_downgrade_time = None
+        self.next_allowed_provisioned_bandwidth_downgrade_time = None
+        self.enabled_protocols = enabled_protocols
+        self.root_squash = root_squash
+        self.version = None
+        self.deleted = None
+        self.deleted_time = None
+        self.remaining_retention_days = None
+        self.access_tier = access_tier
+        self.access_tier_change_time = None
+        self.access_tier_status = None
+        self.share_usage_bytes = None
+        self.lease_status = None
+        self.lease_state = None
+        self.lease_duration = None
+        self.signed_identifiers = signed_identifiers
+        self.snapshot_time = None
+        self.file_share_paid_bursting = file_share_paid_bursting
+
+
+class FileShareItems(_serialization.Model):
+    """Response schema. Contains list of shares returned, and if paging is requested or required, a
+    URL to next page of shares.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar value: List of file shares returned.
+    :vartype value: list[~azure.mgmt.storage.v2024_01_01.models.FileShareItem]
+    :ivar next_link: Request URL that can be used to query next page of shares. Returned when total
+     number of requested shares exceed maximum page size.
+    :vartype next_link: str
+    """
+
+    _validation = {
+        "value": {"readonly": True},
+        "next_link": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "value": {"key": "value", "type": "[FileShareItem]"},
+        "next_link": {"key": "nextLink", "type": "str"},
+    }
+
+    def __init__(self, **kwargs: Any) -> None:
+        """ """
+        super().__init__(**kwargs)
+        self.value = None
+        self.next_link = None
+
+
+class FileShareLimits(_serialization.Model):
+    """Minimum and maximum provisioned storage, IOPS and bandwidth limits for a file share in the
+    storage account.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar min_provisioned_storage_gi_b: The minimum provisioned storage quota limit in gibibytes
+     for a file share in the storage account.
+    :vartype min_provisioned_storage_gi_b: int
+    :ivar max_provisioned_storage_gi_b: The maximum provisioned storage quota limit in gibibytes
+     for a file share in the storage account.
+    :vartype max_provisioned_storage_gi_b: int
+    :ivar min_provisioned_iops: The minimum provisioned IOPS limit for a file share in the storage
+     account.
+    :vartype min_provisioned_iops: int
+    :ivar max_provisioned_iops: The maximum provisioned IOPS limit for a file share in the storage
+     account.
+    :vartype max_provisioned_iops: int
+    :ivar min_provisioned_bandwidth_mi_b_per_sec: The minimum provisioned bandwidth limit in
+     mebibytes per second for a file share in the storage account.
+    :vartype min_provisioned_bandwidth_mi_b_per_sec: int
+    :ivar max_provisioned_bandwidth_mi_b_per_sec: The maximum provisioned bandwidth limit in
+     mebibytes per second for a file share in the storage account.
+    :vartype max_provisioned_bandwidth_mi_b_per_sec: int
+    """
+
+    _validation = {
+        "min_provisioned_storage_gi_b": {"readonly": True},
+        "max_provisioned_storage_gi_b": {"readonly": True},
+        "min_provisioned_iops": {"readonly": True},
+        "max_provisioned_iops": {"readonly": True},
+        "min_provisioned_bandwidth_mi_b_per_sec": {"readonly": True},
+        "max_provisioned_bandwidth_mi_b_per_sec": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "min_provisioned_storage_gi_b": {"key": "minProvisionedStorageGiB", "type": "int"},
+        "max_provisioned_storage_gi_b": {"key": "maxProvisionedStorageGiB", "type": "int"},
+        "min_provisioned_iops": {"key": "minProvisionedIOPS", "type": "int"},
+        "max_provisioned_iops": {"key": "maxProvisionedIOPS", "type": "int"},
+        "min_provisioned_bandwidth_mi_b_per_sec": {"key": "minProvisionedBandwidthMiBPerSec", "type": "int"},
+        "max_provisioned_bandwidth_mi_b_per_sec": {"key": "maxProvisionedBandwidthMiBPerSec", "type": "int"},
+    }
+
+    def __init__(self, **kwargs: Any) -> None:
+        """ """
+        super().__init__(**kwargs)
+        self.min_provisioned_storage_gi_b = None
+        self.max_provisioned_storage_gi_b = None
+        self.min_provisioned_iops = None
+        self.max_provisioned_iops = None
+        self.min_provisioned_bandwidth_mi_b_per_sec = None
+        self.max_provisioned_bandwidth_mi_b_per_sec = None
+
+
+class FileSharePropertiesFileSharePaidBursting(_serialization.Model):
+    """File Share Paid Bursting properties.
+
+    :ivar paid_bursting_enabled: Indicates whether paid bursting is enabled for the share. This
+     property is only for file shares created under Files Provisioned v1 SSD account type.
+    :vartype paid_bursting_enabled: bool
+    :ivar paid_bursting_max_iops: The maximum paid bursting IOPS for the share. This property is
+     only for file shares created under Files Provisioned v1 SSD account type. The maximum allowed
+     value is 102400 which is the maximum allowed IOPS for a share.
+    :vartype paid_bursting_max_iops: int
+    :ivar paid_bursting_max_bandwidth_mibps: The maximum paid bursting bandwidth for the share, in
+     mebibytes per second. This property is only for file shares created under Files Provisioned v1
+     SSD account type. The maximum allowed value is 10340 which is the maximum allowed bandwidth for
+     a share.
+    :vartype paid_bursting_max_bandwidth_mibps: int
+    """
+
+    _attribute_map = {
+        "paid_bursting_enabled": {"key": "paidBurstingEnabled", "type": "bool"},
+        "paid_bursting_max_iops": {"key": "paidBurstingMaxIops", "type": "int"},
+        "paid_bursting_max_bandwidth_mibps": {"key": "paidBurstingMaxBandwidthMibps", "type": "int"},
+    }
+
+    def __init__(
+        self,
+        *,
+        paid_bursting_enabled: Optional[bool] = None,
+        paid_bursting_max_iops: Optional[int] = None,
+        paid_bursting_max_bandwidth_mibps: Optional[int] = None,
+        **kwargs: Any
+    ) -> None:
+        """
+        :keyword paid_bursting_enabled: Indicates whether paid bursting is enabled for the share. This
+         property is only for file shares created under Files Provisioned v1 SSD account type.
+        :paramtype paid_bursting_enabled: bool
+        :keyword paid_bursting_max_iops: The maximum paid bursting IOPS for the share. This property is
+         only for file shares created under Files Provisioned v1 SSD account type. The maximum allowed
+         value is 102400 which is the maximum allowed IOPS for a share.
+        :paramtype paid_bursting_max_iops: int
+        :keyword paid_bursting_max_bandwidth_mibps: The maximum paid bursting bandwidth for the share,
+         in mebibytes per second. This property is only for file shares created under Files Provisioned
+         v1 SSD account type. The maximum allowed value is 10340 which is the maximum allowed bandwidth
+         for a share.
+        :paramtype paid_bursting_max_bandwidth_mibps: int
+        """
+        super().__init__(**kwargs)
+        self.paid_bursting_enabled = paid_bursting_enabled
+        self.paid_bursting_max_iops = paid_bursting_max_iops
+        self.paid_bursting_max_bandwidth_mibps = paid_bursting_max_bandwidth_mibps
+
+
+class FileShareRecommendations(_serialization.Model):
+    """Constants used for calculating recommended provisioned IOPS and bandwidth for a file share in
+    the storage account.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar base_iops: The base IOPS in the file share provisioned IOPS recommendation formula.
+    :vartype base_iops: int
+    :ivar io_scalar: The scalar for IO in the file share provisioned IOPS recommendation formula.
+    :vartype io_scalar: float
+    :ivar base_bandwidth_mi_b_per_sec: The base bandwidth in the file share provisioned bandwidth
+     recommendation formula.
+    :vartype base_bandwidth_mi_b_per_sec: int
+    :ivar bandwidth_scalar: The scalar for bandwidth in the file share provisioned bandwidth
+     recommendation formula.
+    :vartype bandwidth_scalar: float
+    """
+
+    _validation = {
+        "base_iops": {"readonly": True},
+        "io_scalar": {"readonly": True},
+        "base_bandwidth_mi_b_per_sec": {"readonly": True},
+        "bandwidth_scalar": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "base_iops": {"key": "baseIOPS", "type": "int"},
+        "io_scalar": {"key": "ioScalar", "type": "float"},
+        "base_bandwidth_mi_b_per_sec": {"key": "baseBandwidthMiBPerSec", "type": "int"},
+        "bandwidth_scalar": {"key": "bandwidthScalar", "type": "float"},
+    }
+
+    def __init__(self, **kwargs: Any) -> None:
+        """ """
+        super().__init__(**kwargs)
+        self.base_iops = None
+        self.io_scalar = None
+        self.base_bandwidth_mi_b_per_sec = None
+        self.bandwidth_scalar = None
+
+
+class GeoReplicationStats(_serialization.Model):
+    """Statistics related to replication for storage account's Blob, Table, Queue and File services.
+    It is only available when geo-redundant replication is enabled for the storage account.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar status: The status of the secondary location. Possible values are: - Live: Indicates that
+     the secondary location is active and operational. - Bootstrap: Indicates initial
+     synchronization from the primary location to the secondary location is in progress.This
+     typically occurs when replication is first enabled. - Unavailable: Indicates that the secondary
+     location is temporarily unavailable. Known values are: "Live", "Bootstrap", and "Unavailable".
+    :vartype status: str or ~azure.mgmt.storage.v2024_01_01.models.GeoReplicationStatus
+    :ivar last_sync_time: All primary writes preceding this UTC date/time value are guaranteed to
+     be available for read operations. Primary writes following this point in time may or may not be
+     available for reads. Element may be default value if value of LastSyncTime is not available,
+     this can happen if secondary is offline or we are in bootstrap.
+    :vartype last_sync_time: ~datetime.datetime
+    :ivar can_failover: A boolean flag which indicates whether or not account failover is supported
+     for the account.
+    :vartype can_failover: bool
+    :ivar can_planned_failover: A boolean flag which indicates whether or not planned account
+     failover is supported for the account.
+    :vartype can_planned_failover: bool
+    :ivar post_failover_redundancy: The redundancy type of the account after an account failover is
+     performed. Known values are: "Standard_LRS" and "Standard_ZRS".
+    :vartype post_failover_redundancy: str or
+     ~azure.mgmt.storage.v2024_01_01.models.PostFailoverRedundancy
+    :ivar post_planned_failover_redundancy: The redundancy type of the account after a planned
+     account failover is performed. Known values are: "Standard_GRS", "Standard_GZRS",
+     "Standard_RAGRS", and "Standard_RAGZRS".
+    :vartype post_planned_failover_redundancy: str or
+     ~azure.mgmt.storage.v2024_01_01.models.PostPlannedFailoverRedundancy
+    """
+
+    _validation = {
+        "status": {"readonly": True},
+        "last_sync_time": {"readonly": True},
+        "can_failover": {"readonly": True},
+        "can_planned_failover": {"readonly": True},
+        "post_failover_redundancy": {"readonly": True},
+        "post_planned_failover_redundancy": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "status": {"key": "status", "type": "str"},
+        "last_sync_time": {"key": "lastSyncTime", "type": "iso-8601"},
+        "can_failover": {"key": "canFailover", "type": "bool"},
+        "can_planned_failover": {"key": "canPlannedFailover", "type": "bool"},
+        "post_failover_redundancy": {"key": "postFailoverRedundancy", "type": "str"},
+        "post_planned_failover_redundancy": {"key": "postPlannedFailoverRedundancy", "type": "str"},
+    }
+
+    def __init__(self, **kwargs: Any) -> None:
+        """ """
+        super().__init__(**kwargs)
+        self.status = None
+        self.last_sync_time = None
+        self.can_failover = None
+        self.can_planned_failover = None
+        self.post_failover_redundancy = None
+        self.post_planned_failover_redundancy = None
+
+
+class Identity(_serialization.Model):
+    """Identity for the resource.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    All required parameters must be populated in order to send to server.
+
+    :ivar principal_id: The principal ID of resource identity.
+    :vartype principal_id: str
+    :ivar tenant_id: The tenant ID of resource.
+    :vartype tenant_id: str
+    :ivar type: The identity type. Required. Known values are: "None", "SystemAssigned",
+     "UserAssigned", and "SystemAssigned,UserAssigned".
+    :vartype type: str or ~azure.mgmt.storage.v2024_01_01.models.IdentityType
+    :ivar user_assigned_identities: Gets or sets a list of key value pairs that describe the set of
+     User Assigned identities that will be used with this storage account. The key is the ARM
+     resource identifier of the identity. Only 1 User Assigned identity is permitted here.
+    :vartype user_assigned_identities: dict[str,
+     ~azure.mgmt.storage.v2024_01_01.models.UserAssignedIdentity]
+    """
+
+    _validation = {
+        "principal_id": {"readonly": True},
+        "tenant_id": {"readonly": True},
+        "type": {"required": True},
+    }
+
+    _attribute_map = {
+        "principal_id": {"key": "principalId", "type": "str"},
+        "tenant_id": {"key": "tenantId", "type": "str"},
+        "type": {"key": "type", "type": "str"},
+        "user_assigned_identities": {"key": "userAssignedIdentities", "type": "{UserAssignedIdentity}"},
+    }
+
+    def __init__(
+        self,
+        *,
+        type: Union[str, "_models.IdentityType"],
+        user_assigned_identities: Optional[Dict[str, "_models.UserAssignedIdentity"]] = None,
+        **kwargs: Any
+    ) -> None:
+        """
+        :keyword type: The identity type. Required. Known values are: "None", "SystemAssigned",
+         "UserAssigned", and "SystemAssigned,UserAssigned".
+        :paramtype type: str or ~azure.mgmt.storage.v2024_01_01.models.IdentityType
+        :keyword user_assigned_identities: Gets or sets a list of key value pairs that describe the set
+         of User Assigned identities that will be used with this storage account. The key is the ARM
+         resource identifier of the identity. Only 1 User Assigned identity is permitted here.
+        :paramtype user_assigned_identities: dict[str,
+         ~azure.mgmt.storage.v2024_01_01.models.UserAssignedIdentity]
+        """
+        super().__init__(**kwargs)
+        self.principal_id = None
+        self.tenant_id = None
+        self.type = type
+        self.user_assigned_identities = user_assigned_identities
+
+
+class ImmutabilityPolicy(AzureEntityResource):
+    """The ImmutabilityPolicy property of a blob container, including Id, resource name, resource
+    type, Etag.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar id: Fully qualified resource ID for the resource. Ex -
+     /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}.  # pylint: disable=line-too-long
+    :vartype id: str
+    :ivar name: The name of the resource.
+    :vartype name: str
+    :ivar type: The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or
+     "Microsoft.Storage/storageAccounts".
+    :vartype type: str
+    :ivar etag: Resource Etag.
+    :vartype etag: str
+    :ivar immutability_period_since_creation_in_days: The immutability period for the blobs in the
+     container since the policy creation, in days.
+    :vartype immutability_period_since_creation_in_days: int
+    :ivar state: The ImmutabilityPolicy state of a blob container, possible values include: Locked
+     and Unlocked. Known values are: "Locked" and "Unlocked".
+    :vartype state: str or ~azure.mgmt.storage.v2024_01_01.models.ImmutabilityPolicyState
+    :ivar allow_protected_append_writes: This property can only be changed for unlocked time-based
+     retention policies. When enabled, new blocks can be written to an append blob while maintaining
+     immutability protection and compliance. Only new blocks can be added and any existing blocks
+     cannot be modified or deleted. This property cannot be changed with ExtendImmutabilityPolicy
+     API.
+    :vartype allow_protected_append_writes: bool
+    :ivar allow_protected_append_writes_all: This property can only be changed for unlocked
+     time-based retention policies. When enabled, new blocks can be written to both 'Append and Bock
+     Blobs' while maintaining immutability protection and compliance. Only new blocks can be added
+     and any existing blocks cannot be modified or deleted. This property cannot be changed with
+     ExtendImmutabilityPolicy API. The 'allowProtectedAppendWrites' and
+     'allowProtectedAppendWritesAll' properties are mutually exclusive.
+    :vartype allow_protected_append_writes_all: bool
+    """
+
+    _validation = {
+        "id": {"readonly": True},
+        "name": {"readonly": True},
+        "type": {"readonly": True},
+        "etag": {"readonly": True},
+        "state": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "id": {"key": "id", "type": "str"},
+        "name": {"key": "name", "type": "str"},
+        "type": {"key": "type", "type": "str"},
+        "etag": {"key": "etag", "type": "str"},
+        "immutability_period_since_creation_in_days": {
+            "key": "properties.immutabilityPeriodSinceCreationInDays",
+            "type": "int",
+        },
+        "state": {"key": "properties.state", "type": "str"},
+        "allow_protected_append_writes": {"key": "properties.allowProtectedAppendWrites", "type": "bool"},
+        "allow_protected_append_writes_all": {"key": "properties.allowProtectedAppendWritesAll", "type": "bool"},
+    }
+
+    def __init__(
+        self,
+        *,
+        immutability_period_since_creation_in_days: Optional[int] = None,
+        allow_protected_append_writes: Optional[bool] = None,
+        allow_protected_append_writes_all: Optional[bool] = None,
+        **kwargs: Any
+    ) -> None:
+        """
+        :keyword immutability_period_since_creation_in_days: The immutability period for the blobs in
+         the container since the policy creation, in days.
+        :paramtype immutability_period_since_creation_in_days: int
+        :keyword allow_protected_append_writes: This property can only be changed for unlocked
+         time-based retention policies. When enabled, new blocks can be written to an append blob while
+         maintaining immutability protection and compliance. Only new blocks can be added and any
+         existing blocks cannot be modified or deleted. This property cannot be changed with
+         ExtendImmutabilityPolicy API.
+        :paramtype allow_protected_append_writes: bool
+        :keyword allow_protected_append_writes_all: This property can only be changed for unlocked
+         time-based retention policies. When enabled, new blocks can be written to both 'Append and Bock
+         Blobs' while maintaining immutability protection and compliance. Only new blocks can be added
+         and any existing blocks cannot be modified or deleted. This property cannot be changed with
+         ExtendImmutabilityPolicy API. The 'allowProtectedAppendWrites' and
+         'allowProtectedAppendWritesAll' properties are mutually exclusive.
+        :paramtype allow_protected_append_writes_all: bool
+        """
+        super().__init__(**kwargs)
+        self.immutability_period_since_creation_in_days = immutability_period_since_creation_in_days
+        self.state = None
+        self.allow_protected_append_writes = allow_protected_append_writes
+        self.allow_protected_append_writes_all = allow_protected_append_writes_all
+
+
+class ImmutabilityPolicyProperties(_serialization.Model):
+    """The properties of an ImmutabilityPolicy of a blob container.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar etag: ImmutabilityPolicy Etag.
+    :vartype etag: str
+    :ivar update_history: The ImmutabilityPolicy update history of the blob container.
+    :vartype update_history: list[~azure.mgmt.storage.v2024_01_01.models.UpdateHistoryProperty]
+    :ivar immutability_period_since_creation_in_days: The immutability period for the blobs in the
+     container since the policy creation, in days.
+    :vartype immutability_period_since_creation_in_days: int
+    :ivar state: The ImmutabilityPolicy state of a blob container, possible values include: Locked
+     and Unlocked. Known values are: "Locked" and "Unlocked".
+    :vartype state: str or ~azure.mgmt.storage.v2024_01_01.models.ImmutabilityPolicyState
+    :ivar allow_protected_append_writes: This property can only be changed for unlocked time-based
+     retention policies. When enabled, new blocks can be written to an append blob while maintaining
+     immutability protection and compliance. Only new blocks can be added and any existing blocks
+     cannot be modified or deleted. This property cannot be changed with ExtendImmutabilityPolicy
+     API.
+    :vartype allow_protected_append_writes: bool
+    :ivar allow_protected_append_writes_all: This property can only be changed for unlocked
+     time-based retention policies. When enabled, new blocks can be written to both 'Append and Bock
+     Blobs' while maintaining immutability protection and compliance. Only new blocks can be added
+     and any existing blocks cannot be modified or deleted. This property cannot be changed with
+     ExtendImmutabilityPolicy API. The 'allowProtectedAppendWrites' and
+     'allowProtectedAppendWritesAll' properties are mutually exclusive.
+    :vartype allow_protected_append_writes_all: bool
+    """
+
+    _validation = {
+        "etag": {"readonly": True},
+        "update_history": {"readonly": True},
+        "state": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "etag": {"key": "etag", "type": "str"},
+        "update_history": {"key": "updateHistory", "type": "[UpdateHistoryProperty]"},
+        "immutability_period_since_creation_in_days": {
+            "key": "properties.immutabilityPeriodSinceCreationInDays",
+            "type": "int",
+        },
+        "state": {"key": "properties.state", "type": "str"},
+        "allow_protected_append_writes": {"key": "properties.allowProtectedAppendWrites", "type": "bool"},
+        "allow_protected_append_writes_all": {"key": "properties.allowProtectedAppendWritesAll", "type": "bool"},
+    }
+
+    def __init__(
+        self,
+        *,
+        immutability_period_since_creation_in_days: Optional[int] = None,
+        allow_protected_append_writes: Optional[bool] = None,
+        allow_protected_append_writes_all: Optional[bool] = None,
+        **kwargs: Any
+    ) -> None:
+        """
+        :keyword immutability_period_since_creation_in_days: The immutability period for the blobs in
+         the container since the policy creation, in days.
+        :paramtype immutability_period_since_creation_in_days: int
+        :keyword allow_protected_append_writes: This property can only be changed for unlocked
+         time-based retention policies. When enabled, new blocks can be written to an append blob while
+         maintaining immutability protection and compliance. Only new blocks can be added and any
+         existing blocks cannot be modified or deleted. This property cannot be changed with
+         ExtendImmutabilityPolicy API.
+        :paramtype allow_protected_append_writes: bool
+        :keyword allow_protected_append_writes_all: This property can only be changed for unlocked
+         time-based retention policies. When enabled, new blocks can be written to both 'Append and Bock
+         Blobs' while maintaining immutability protection and compliance. Only new blocks can be added
+         and any existing blocks cannot be modified or deleted. This property cannot be changed with
+         ExtendImmutabilityPolicy API. The 'allowProtectedAppendWrites' and
+         'allowProtectedAppendWritesAll' properties are mutually exclusive.
+        :paramtype allow_protected_append_writes_all: bool
+        """
+        super().__init__(**kwargs)
+        self.etag = None
+        self.update_history = None
+        self.immutability_period_since_creation_in_days = immutability_period_since_creation_in_days
+        self.state = None
+        self.allow_protected_append_writes = allow_protected_append_writes
+        self.allow_protected_append_writes_all = allow_protected_append_writes_all
+
+
+class ImmutableStorageAccount(_serialization.Model):
+    """This property enables and defines account-level immutability. Enabling the feature auto-enables
+    Blob Versioning.
+
+    :ivar enabled: A boolean flag which enables account-level immutability. All the containers
+     under such an account have object-level immutability enabled by default.
+    :vartype enabled: bool
+    :ivar immutability_policy: Specifies the default account-level immutability policy which is
+     inherited and applied to objects that do not possess an explicit immutability policy at the
+     object level. The object-level immutability policy has higher precedence than the
+     container-level immutability policy, which has a higher precedence than the account-level
+     immutability policy.
+    :vartype immutability_policy:
+     ~azure.mgmt.storage.v2024_01_01.models.AccountImmutabilityPolicyProperties
+    """
+
+    _attribute_map = {
+        "enabled": {"key": "enabled", "type": "bool"},
+        "immutability_policy": {"key": "immutabilityPolicy", "type": "AccountImmutabilityPolicyProperties"},
+    }
+
+    def __init__(
+        self,
+        *,
+        enabled: Optional[bool] = None,
+        immutability_policy: Optional["_models.AccountImmutabilityPolicyProperties"] = None,
+        **kwargs: Any
+    ) -> None:
+        """
+        :keyword enabled: A boolean flag which enables account-level immutability. All the containers
+         under such an account have object-level immutability enabled by default.
+        :paramtype enabled: bool
+        :keyword immutability_policy: Specifies the default account-level immutability policy which is
+         inherited and applied to objects that do not possess an explicit immutability policy at the
+         object level. The object-level immutability policy has higher precedence than the
+         container-level immutability policy, which has a higher precedence than the account-level
+         immutability policy.
+        :paramtype immutability_policy:
+         ~azure.mgmt.storage.v2024_01_01.models.AccountImmutabilityPolicyProperties
+        """
+        super().__init__(**kwargs)
+        self.enabled = enabled
+        self.immutability_policy = immutability_policy
+
+
+class ImmutableStorageWithVersioning(_serialization.Model):
+    """Object level immutability properties of the container.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar enabled: This is an immutable property, when set to true it enables object level
+     immutability at the container level.
+    :vartype enabled: bool
+    :ivar time_stamp: Returns the date and time the object level immutability was enabled.
+    :vartype time_stamp: ~datetime.datetime
+    :ivar migration_state: This property denotes the container level immutability to object level
+     immutability migration state. Known values are: "InProgress" and "Completed".
+    :vartype migration_state: str or ~azure.mgmt.storage.v2024_01_01.models.MigrationState
+    """
+
+    _validation = {
+        "time_stamp": {"readonly": True},
+        "migration_state": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "enabled": {"key": "enabled", "type": "bool"},
+        "time_stamp": {"key": "timeStamp", "type": "iso-8601"},
+        "migration_state": {"key": "migrationState", "type": "str"},
+    }
+
+    def __init__(self, *, enabled: Optional[bool] = None, **kwargs: Any) -> None:
+        """
+        :keyword enabled: This is an immutable property, when set to true it enables object level
+         immutability at the container level.
+        :paramtype enabled: bool
+        """
+        super().__init__(**kwargs)
+        self.enabled = enabled
+        self.time_stamp = None
+        self.migration_state = None
+
+
+class IPRule(_serialization.Model):
+    """IP rule with specific IP or IP range in CIDR format.
+
+    All required parameters must be populated in order to send to server.
+
+    :ivar ip_address_or_range: Specifies the IP or IP range in CIDR format. Only IPV4 address is
+     allowed. Required.
+    :vartype ip_address_or_range: str
+    :ivar action: The action of IP ACL rule. Default value is "Allow".
+    :vartype action: str
+    """
+
+    _validation = {
+        "ip_address_or_range": {"required": True},
+    }
+
+    _attribute_map = {
+        "ip_address_or_range": {"key": "value", "type": "str"},
+        "action": {"key": "action", "type": "str"},
+    }
+
+    def __init__(self, *, ip_address_or_range: str, action: Optional[Literal["Allow"]] = None, **kwargs: Any) -> None:
+        """
+        :keyword ip_address_or_range: Specifies the IP or IP range in CIDR format. Only IPV4 address is
+         allowed. Required.
+        :paramtype ip_address_or_range: str
+        :keyword action: The action of IP ACL rule. Default value is "Allow".
+        :paramtype action: str
+        """
+        super().__init__(**kwargs)
+        self.ip_address_or_range = ip_address_or_range
+        self.action = action
+
+
+class KeyCreationTime(_serialization.Model):
+    """Storage account keys creation time.
+
+    :ivar key1:
+    :vartype key1: ~datetime.datetime
+    :ivar key2:
+    :vartype key2: ~datetime.datetime
+    """
+
+    _attribute_map = {
+        "key1": {"key": "key1", "type": "iso-8601"},
+        "key2": {"key": "key2", "type": "iso-8601"},
+    }
+
+    def __init__(
+        self, *, key1: Optional[datetime.datetime] = None, key2: Optional[datetime.datetime] = None, **kwargs: Any
+    ) -> None:
+        """
+        :keyword key1:
+        :paramtype key1: ~datetime.datetime
+        :keyword key2:
+        :paramtype key2: ~datetime.datetime
+        """
+        super().__init__(**kwargs)
+        self.key1 = key1
+        self.key2 = key2
+
+
+class KeyPolicy(_serialization.Model):
+    """KeyPolicy assigned to the storage account.
+
+    All required parameters must be populated in order to send to server.
+
+    :ivar key_expiration_period_in_days: The key expiration period in days. Required.
+    :vartype key_expiration_period_in_days: int
+    """
+
+    _validation = {
+        "key_expiration_period_in_days": {"required": True},
+    }
+
+    _attribute_map = {
+        "key_expiration_period_in_days": {"key": "keyExpirationPeriodInDays", "type": "int"},
+    }
+
+    def __init__(self, *, key_expiration_period_in_days: int, **kwargs: Any) -> None:
+        """
+        :keyword key_expiration_period_in_days: The key expiration period in days. Required.
+        :paramtype key_expiration_period_in_days: int
+        """
+        super().__init__(**kwargs)
+        self.key_expiration_period_in_days = key_expiration_period_in_days
+
+
+class KeyVaultProperties(_serialization.Model):
+    """Properties of key vault.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar key_name: The name of KeyVault key.
+    :vartype key_name: str
+    :ivar key_version: The version of KeyVault key.
+    :vartype key_version: str
+    :ivar key_vault_uri: The Uri of KeyVault.
+    :vartype key_vault_uri: str
+    :ivar current_versioned_key_identifier: The object identifier of the current versioned Key
+     Vault Key in use.
+    :vartype current_versioned_key_identifier: str
+    :ivar last_key_rotation_timestamp: Timestamp of last rotation of the Key Vault Key.
+    :vartype last_key_rotation_timestamp: ~datetime.datetime
+    :ivar current_versioned_key_expiration_timestamp: This is a read only property that represents
+     the expiration time of the current version of the customer managed key used for encryption.
+    :vartype current_versioned_key_expiration_timestamp: ~datetime.datetime
+    """
+
+    _validation = {
+        "current_versioned_key_identifier": {"readonly": True},
+        "last_key_rotation_timestamp": {"readonly": True},
+        "current_versioned_key_expiration_timestamp": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "key_name": {"key": "keyname", "type": "str"},
+        "key_version": {"key": "keyversion", "type": "str"},
+        "key_vault_uri": {"key": "keyvaulturi", "type": "str"},
+        "current_versioned_key_identifier": {"key": "currentVersionedKeyIdentifier", "type": "str"},
+        "last_key_rotation_timestamp": {"key": "lastKeyRotationTimestamp", "type": "iso-8601"},
+        "current_versioned_key_expiration_timestamp": {
+            "key": "currentVersionedKeyExpirationTimestamp",
+            "type": "iso-8601",
+        },
+    }
+
+    def __init__(
+        self,
+        *,
+        key_name: Optional[str] = None,
+        key_version: Optional[str] = None,
+        key_vault_uri: Optional[str] = None,
+        **kwargs: Any
+    ) -> None:
+        """
+        :keyword key_name: The name of KeyVault key.
+        :paramtype key_name: str
+        :keyword key_version: The version of KeyVault key.
+        :paramtype key_version: str
+        :keyword key_vault_uri: The Uri of KeyVault.
+        :paramtype key_vault_uri: str
+        """
+        super().__init__(**kwargs)
+        self.key_name = key_name
+        self.key_version = key_version
+        self.key_vault_uri = key_vault_uri
+        self.current_versioned_key_identifier = None
+        self.last_key_rotation_timestamp = None
+        self.current_versioned_key_expiration_timestamp = None
+
+
+class LastAccessTimeTrackingPolicy(_serialization.Model):
+    """The blob service properties for Last access time based tracking policy.
+
+    All required parameters must be populated in order to send to server.
+
+    :ivar enable: When set to true last access time based tracking is enabled. Required.
+    :vartype enable: bool
+    :ivar name: Name of the policy. The valid value is AccessTimeTracking. This field is currently
+     read only. "AccessTimeTracking"
+    :vartype name: str or ~azure.mgmt.storage.v2024_01_01.models.Name
+    :ivar tracking_granularity_in_days: The field specifies blob object tracking granularity in
+     days, typically how often the blob object should be tracked.This field is currently read only
+     with value as 1.
+    :vartype tracking_granularity_in_days: int
+    :ivar blob_type: An array of predefined supported blob types. Only blockBlob is the supported
+     value. This field is currently read only.
+    :vartype blob_type: list[str]
+    """
+
+    _validation = {
+        "enable": {"required": True},
+    }
+
+    _attribute_map = {
+        "enable": {"key": "enable", "type": "bool"},
+        "name": {"key": "name", "type": "str"},
+        "tracking_granularity_in_days": {"key": "trackingGranularityInDays", "type": "int"},
+        "blob_type": {"key": "blobType", "type": "[str]"},
+    }
+
+    def __init__(
+        self,
+        *,
+        enable: bool,
+        name: Optional[Union[str, "_models.Name"]] = None,
+        tracking_granularity_in_days: Optional[int] = None,
+        blob_type: Optional[List[str]] = None,
+        **kwargs: Any
+    ) -> None:
+        """
+        :keyword enable: When set to true last access time based tracking is enabled. Required.
+        :paramtype enable: bool
+        :keyword name: Name of the policy. The valid value is AccessTimeTracking. This field is
+         currently read only. "AccessTimeTracking"
+        :paramtype name: str or ~azure.mgmt.storage.v2024_01_01.models.Name
+        :keyword tracking_granularity_in_days: The field specifies blob object tracking granularity in
+         days, typically how often the blob object should be tracked.This field is currently read only
+         with value as 1.
+        :paramtype tracking_granularity_in_days: int
+        :keyword blob_type: An array of predefined supported blob types. Only blockBlob is the
+         supported value. This field is currently read only.
+        :paramtype blob_type: list[str]
+        """
+        super().__init__(**kwargs)
+        self.enable = enable
+        self.name = name
+        self.tracking_granularity_in_days = tracking_granularity_in_days
+        self.blob_type = blob_type
+
+
+class LeaseContainerRequest(_serialization.Model):
+    """Lease Container request schema.
+
+    All required parameters must be populated in order to send to server.
+
+    :ivar action: Specifies the lease action. Can be one of the available actions. Required. Known
+     values are: "Acquire", "Renew", "Change", "Release", "Break", and "Break".
+    :vartype action: str or ~azure.mgmt.storage.v2024_01_01.models.LeaseContainerRequestEnum
+    :ivar lease_id: Identifies the lease. Can be specified in any valid GUID string format.
+    :vartype lease_id: str
+    :ivar break_period: Optional. For a break action, proposed duration the lease should continue
+     before it is broken, in seconds, between 0 and 60.
+    :vartype break_period: int
+    :ivar lease_duration: Required for acquire. Specifies the duration of the lease, in seconds, or
+     negative one (-1) for a lease that never expires.
+    :vartype lease_duration: int
+    :ivar proposed_lease_id: Optional for acquire, required for change. Proposed lease ID, in a
+     GUID string format.
+    :vartype proposed_lease_id: str
+    """
+
+    _validation = {
+        "action": {"required": True},
+    }
+
+    _attribute_map = {
+        "action": {"key": "action", "type": "str"},
+        "lease_id": {"key": "leaseId", "type": "str"},
+        "break_period": {"key": "breakPeriod", "type": "int"},
+        "lease_duration": {"key": "leaseDuration", "type": "int"},
+        "proposed_lease_id": {"key": "proposedLeaseId", "type": "str"},
+    }
+
+    def __init__(
+        self,
+        *,
+        action: Union[str, "_models.LeaseContainerRequestEnum"],
+        lease_id: Optional[str] = None,
+        break_period: Optional[int] = None,
+        lease_duration: Optional[int] = None,
+        proposed_lease_id: Optional[str] = None,
+        **kwargs: Any
+    ) -> None:
+        """
+        :keyword action: Specifies the lease action. Can be one of the available actions. Required.
+         Known values are: "Acquire", "Renew", "Change", "Release", "Break", and "Break".
+        :paramtype action: str or ~azure.mgmt.storage.v2024_01_01.models.LeaseContainerRequestEnum
+        :keyword lease_id: Identifies the lease. Can be specified in any valid GUID string format.
+        :paramtype lease_id: str
+        :keyword break_period: Optional. For a break action, proposed duration the lease should
+         continue before it is broken, in seconds, between 0 and 60.
+        :paramtype break_period: int
+        :keyword lease_duration: Required for acquire. Specifies the duration of the lease, in seconds,
+         or negative one (-1) for a lease that never expires.
+        :paramtype lease_duration: int
+        :keyword proposed_lease_id: Optional for acquire, required for change. Proposed lease ID, in a
+         GUID string format.
+        :paramtype proposed_lease_id: str
+        """
+        super().__init__(**kwargs)
+        self.action = action
+        self.lease_id = lease_id
+        self.break_period = break_period
+        self.lease_duration = lease_duration
+        self.proposed_lease_id = proposed_lease_id
+
+
+class LeaseContainerResponse(_serialization.Model):
+    """Lease Container response schema.
+
+    :ivar lease_id: Returned unique lease ID that must be included with any request to delete the
+     container, or to renew, change, or release the lease.
+    :vartype lease_id: str
+    :ivar lease_time_seconds: Approximate time remaining in the lease period, in seconds.
+    :vartype lease_time_seconds: str
+    """
+
+    _attribute_map = {
+        "lease_id": {"key": "leaseId", "type": "str"},
+        "lease_time_seconds": {"key": "leaseTimeSeconds", "type": "str"},
+    }
+
+    def __init__(
+        self, *, lease_id: Optional[str] = None, lease_time_seconds: Optional[str] = None, **kwargs: Any
+    ) -> None:
+        """
+        :keyword lease_id: Returned unique lease ID that must be included with any request to delete
+         the container, or to renew, change, or release the lease.
+        :paramtype lease_id: str
+        :keyword lease_time_seconds: Approximate time remaining in the lease period, in seconds.
+        :paramtype lease_time_seconds: str
+        """
+        super().__init__(**kwargs)
+        self.lease_id = lease_id
+        self.lease_time_seconds = lease_time_seconds
+
+
+class LeaseShareRequest(_serialization.Model):
+    """Lease Share request schema.
+
+    All required parameters must be populated in order to send to server.
+
+    :ivar action: Specifies the lease action. Can be one of the available actions. Required. Known
+     values are: "Acquire", "Renew", "Change", "Release", "Break", and "Break".
+    :vartype action: str or ~azure.mgmt.storage.v2024_01_01.models.LeaseShareAction
+    :ivar lease_id: Identifies the lease. Can be specified in any valid GUID string format.
+    :vartype lease_id: str
+    :ivar break_period: Optional. For a break action, proposed duration the lease should continue
+     before it is broken, in seconds, between 0 and 60.
+    :vartype break_period: int
+    :ivar lease_duration: Required for acquire. Specifies the duration of the lease, in seconds, or
+     negative one (-1) for a lease that never expires.
+    :vartype lease_duration: int
+    :ivar proposed_lease_id: Optional for acquire, required for change. Proposed lease ID, in a
+     GUID string format.
+    :vartype proposed_lease_id: str
+    """
+
+    _validation = {
+        "action": {"required": True},
+    }
+
+    _attribute_map = {
+        "action": {"key": "action", "type": "str"},
+        "lease_id": {"key": "leaseId", "type": "str"},
+        "break_period": {"key": "breakPeriod", "type": "int"},
+        "lease_duration": {"key": "leaseDuration", "type": "int"},
+        "proposed_lease_id": {"key": "proposedLeaseId", "type": "str"},
+    }
+
+    def __init__(
+        self,
+        *,
+        action: Union[str, "_models.LeaseShareAction"],
+        lease_id: Optional[str] = None,
+        break_period: Optional[int] = None,
+        lease_duration: Optional[int] = None,
+        proposed_lease_id: Optional[str] = None,
+        **kwargs: Any
+    ) -> None:
+        """
+        :keyword action: Specifies the lease action. Can be one of the available actions. Required.
+         Known values are: "Acquire", "Renew", "Change", "Release", "Break", and "Break".
+        :paramtype action: str or ~azure.mgmt.storage.v2024_01_01.models.LeaseShareAction
+        :keyword lease_id: Identifies the lease. Can be specified in any valid GUID string format.
+        :paramtype lease_id: str
+        :keyword break_period: Optional. For a break action, proposed duration the lease should
+         continue before it is broken, in seconds, between 0 and 60.
+        :paramtype break_period: int
+        :keyword lease_duration: Required for acquire. Specifies the duration of the lease, in seconds,
+         or negative one (-1) for a lease that never expires.
+        :paramtype lease_duration: int
+        :keyword proposed_lease_id: Optional for acquire, required for change. Proposed lease ID, in a
+         GUID string format.
+        :paramtype proposed_lease_id: str
+        """
+        super().__init__(**kwargs)
+        self.action = action
+        self.lease_id = lease_id
+        self.break_period = break_period
+        self.lease_duration = lease_duration
+        self.proposed_lease_id = proposed_lease_id
+
+
+class LeaseShareResponse(_serialization.Model):
+    """Lease Share response schema.
+
+    :ivar lease_id: Returned unique lease ID that must be included with any request to delete the
+     share, or to renew, change, or release the lease.
+    :vartype lease_id: str
+    :ivar lease_time_seconds: Approximate time remaining in the lease period, in seconds.
+    :vartype lease_time_seconds: str
+    """
+
+    _attribute_map = {
+        "lease_id": {"key": "leaseId", "type": "str"},
+        "lease_time_seconds": {"key": "leaseTimeSeconds", "type": "str"},
+    }
+
+    def __init__(
+        self, *, lease_id: Optional[str] = None, lease_time_seconds: Optional[str] = None, **kwargs: Any
+    ) -> None:
+        """
+        :keyword lease_id: Returned unique lease ID that must be included with any request to delete
+         the share, or to renew, change, or release the lease.
+        :paramtype lease_id: str
+        :keyword lease_time_seconds: Approximate time remaining in the lease period, in seconds.
+        :paramtype lease_time_seconds: str
+        """
+        super().__init__(**kwargs)
+        self.lease_id = lease_id
+        self.lease_time_seconds = lease_time_seconds
+
+
+class LegalHold(_serialization.Model):
+    """The LegalHold property of a blob container.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    All required parameters must be populated in order to send to server.
+
+    :ivar has_legal_hold: The hasLegalHold public property is set to true by SRP if there are at
+     least one existing tag. The hasLegalHold public property is set to false by SRP if all existing
+     legal hold tags are cleared out. There can be a maximum of 1000 blob containers with
+     hasLegalHold=true for a given account.
+    :vartype has_legal_hold: bool
+    :ivar tags: Each tag should be 3 to 23 alphanumeric characters and is normalized to lower case
+     at SRP. Required.
+    :vartype tags: list[str]
+    :ivar allow_protected_append_writes_all: When enabled, new blocks can be written to both
+     'Append and Bock Blobs' while maintaining legal hold protection and compliance. Only new blocks
+     can be added and any existing blocks cannot be modified or deleted.
+    :vartype allow_protected_append_writes_all: bool
+    """
+
+    _validation = {
+        "has_legal_hold": {"readonly": True},
+        "tags": {"required": True},
+    }
+
+    _attribute_map = {
+        "has_legal_hold": {"key": "hasLegalHold", "type": "bool"},
+        "tags": {"key": "tags", "type": "[str]"},
+        "allow_protected_append_writes_all": {"key": "allowProtectedAppendWritesAll", "type": "bool"},
+    }
+
+    def __init__(
+        self, *, tags: List[str], allow_protected_append_writes_all: Optional[bool] = None, **kwargs: Any
+    ) -> None:
+        """
+        :keyword tags: Each tag should be 3 to 23 alphanumeric characters and is normalized to lower
+         case at SRP. Required.
+        :paramtype tags: list[str]
+        :keyword allow_protected_append_writes_all: When enabled, new blocks can be written to both
+         'Append and Bock Blobs' while maintaining legal hold protection and compliance. Only new blocks
+         can be added and any existing blocks cannot be modified or deleted.
+        :paramtype allow_protected_append_writes_all: bool
+        """
+        super().__init__(**kwargs)
+        self.has_legal_hold = None
+        self.tags = tags
+        self.allow_protected_append_writes_all = allow_protected_append_writes_all
+
+
+class LegalHoldProperties(_serialization.Model):
+    """The LegalHold property of a blob container.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar has_legal_hold: The hasLegalHold public property is set to true by SRP if there are at
+     least one existing tag. The hasLegalHold public property is set to false by SRP if all existing
+     legal hold tags are cleared out. There can be a maximum of 1000 blob containers with
+     hasLegalHold=true for a given account.
+    :vartype has_legal_hold: bool
+    :ivar tags: The list of LegalHold tags of a blob container.
+    :vartype tags: list[~azure.mgmt.storage.v2024_01_01.models.TagProperty]
+    :ivar protected_append_writes_history: Protected append blob writes history.
+    :vartype protected_append_writes_history:
+     ~azure.mgmt.storage.v2024_01_01.models.ProtectedAppendWritesHistory
+    """
+
+    _validation = {
+        "has_legal_hold": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "has_legal_hold": {"key": "hasLegalHold", "type": "bool"},
+        "tags": {"key": "tags", "type": "[TagProperty]"},
+        "protected_append_writes_history": {
+            "key": "protectedAppendWritesHistory",
+            "type": "ProtectedAppendWritesHistory",
+        },
+    }
+
+    def __init__(
+        self,
+        *,
+        tags: Optional[List["_models.TagProperty"]] = None,
+        protected_append_writes_history: Optional["_models.ProtectedAppendWritesHistory"] = None,
+        **kwargs: Any
+    ) -> None:
+        """
+        :keyword tags: The list of LegalHold tags of a blob container.
+        :paramtype tags: list[~azure.mgmt.storage.v2024_01_01.models.TagProperty]
+        :keyword protected_append_writes_history: Protected append blob writes history.
+        :paramtype protected_append_writes_history:
+         ~azure.mgmt.storage.v2024_01_01.models.ProtectedAppendWritesHistory
+        """
+        super().__init__(**kwargs)
+        self.has_legal_hold = None
+        self.tags = tags
+        self.protected_append_writes_history = protected_append_writes_history
+
+
+class ListAccountSasResponse(_serialization.Model):
+    """The List SAS credentials operation response.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar account_sas_token: List SAS credentials of storage account.
+    :vartype account_sas_token: str
+    """
+
+    _validation = {
+        "account_sas_token": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "account_sas_token": {"key": "accountSasToken", "type": "str"},
+    }
+
+    def __init__(self, **kwargs: Any) -> None:
+        """ """
+        super().__init__(**kwargs)
+        self.account_sas_token = None
+
+
+class ListBlobInventoryPolicy(_serialization.Model):
+    """List of blob inventory policies returned.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar value: List of blob inventory policies.
+    :vartype value: list[~azure.mgmt.storage.v2024_01_01.models.BlobInventoryPolicy]
+    """
+
+    _validation = {
+        "value": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "value": {"key": "value", "type": "[BlobInventoryPolicy]"},
+    }
+
+    def __init__(self, **kwargs: Any) -> None:
+        """ """
+        super().__init__(**kwargs)
+        self.value = None
+
+
+class ListContainerItem(AzureEntityResource):
+    """The blob container properties be listed out.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar id: Fully qualified resource ID for the resource. Ex -
+     /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}.  # pylint: disable=line-too-long
+    :vartype id: str
+    :ivar name: The name of the resource.
+    :vartype name: str
+    :ivar type: The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or
+     "Microsoft.Storage/storageAccounts".
+    :vartype type: str
+    :ivar etag: Resource Etag.
+    :vartype etag: str
+    :ivar version: The version of the deleted blob container.
+    :vartype version: str
+    :ivar deleted: Indicates whether the blob container was deleted.
+    :vartype deleted: bool
+    :ivar deleted_time: Blob container deletion time.
+    :vartype deleted_time: ~datetime.datetime
+    :ivar remaining_retention_days: Remaining retention days for soft deleted blob container.
+    :vartype remaining_retention_days: int
+    :ivar default_encryption_scope: Default the container to use specified encryption scope for all
+     writes.
+    :vartype default_encryption_scope: str
+    :ivar deny_encryption_scope_override: Block override of encryption scope from the container
+     default.
+    :vartype deny_encryption_scope_override: bool
+    :ivar public_access: Specifies whether data in the container may be accessed publicly and the
+     level of access. Known values are: "Container", "Blob", and "None".
+    :vartype public_access: str or ~azure.mgmt.storage.v2024_01_01.models.PublicAccess
+    :ivar last_modified_time: Returns the date and time the container was last modified.
+    :vartype last_modified_time: ~datetime.datetime
+    :ivar lease_status: The lease status of the container. Known values are: "Locked" and
+     "Unlocked".
+    :vartype lease_status: str or ~azure.mgmt.storage.v2024_01_01.models.LeaseStatus
+    :ivar lease_state: Lease state of the container. Known values are: "Available", "Leased",
+     "Expired", "Breaking", and "Broken".
+    :vartype lease_state: str or ~azure.mgmt.storage.v2024_01_01.models.LeaseState
+    :ivar lease_duration: Specifies whether the lease on a container is of infinite or fixed
+     duration, only when the container is leased. Known values are: "Infinite" and "Fixed".
+    :vartype lease_duration: str or ~azure.mgmt.storage.v2024_01_01.models.LeaseDuration
+    :ivar metadata: A name-value pair to associate with the container as metadata.
+    :vartype metadata: dict[str, str]
+    :ivar immutability_policy: The ImmutabilityPolicy property of the container.
+    :vartype immutability_policy:
+     ~azure.mgmt.storage.v2024_01_01.models.ImmutabilityPolicyProperties
+    :ivar legal_hold: The LegalHold property of the container.
+    :vartype legal_hold: ~azure.mgmt.storage.v2024_01_01.models.LegalHoldProperties
+    :ivar has_legal_hold: The hasLegalHold public property is set to true by SRP if there are at
+     least one existing tag. The hasLegalHold public property is set to false by SRP if all existing
+     legal hold tags are cleared out. There can be a maximum of 1000 blob containers with
+     hasLegalHold=true for a given account.
+    :vartype has_legal_hold: bool
+    :ivar has_immutability_policy: The hasImmutabilityPolicy public property is set to true by SRP
+     if ImmutabilityPolicy has been created for this container. The hasImmutabilityPolicy public
+     property is set to false by SRP if ImmutabilityPolicy has not been created for this container.
+    :vartype has_immutability_policy: bool
+    :ivar immutable_storage_with_versioning: The object level immutability property of the
+     container. The property is immutable and can only be set to true at the container creation
+     time. Existing containers must undergo a migration process.
+    :vartype immutable_storage_with_versioning:
+     ~azure.mgmt.storage.v2024_01_01.models.ImmutableStorageWithVersioning
+    :ivar enable_nfs_v3_root_squash: Enable NFSv3 root squash on blob container.
+    :vartype enable_nfs_v3_root_squash: bool
+    :ivar enable_nfs_v3_all_squash: Enable NFSv3 all squash on blob container.
+    :vartype enable_nfs_v3_all_squash: bool
+    """
+
+    _validation = {
+        "id": {"readonly": True},
+        "name": {"readonly": True},
+        "type": {"readonly": True},
+        "etag": {"readonly": True},
+        "version": {"readonly": True},
+        "deleted": {"readonly": True},
+        "deleted_time": {"readonly": True},
+        "remaining_retention_days": {"readonly": True},
+        "last_modified_time": {"readonly": True},
+        "lease_status": {"readonly": True},
+        "lease_state": {"readonly": True},
+        "lease_duration": {"readonly": True},
+        "immutability_policy": {"readonly": True},
+        "legal_hold": {"readonly": True},
+        "has_legal_hold": {"readonly": True},
+        "has_immutability_policy": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "id": {"key": "id", "type": "str"},
+        "name": {"key": "name", "type": "str"},
+        "type": {"key": "type", "type": "str"},
+        "etag": {"key": "etag", "type": "str"},
+        "version": {"key": "properties.version", "type": "str"},
+        "deleted": {"key": "properties.deleted", "type": "bool"},
+        "deleted_time": {"key": "properties.deletedTime", "type": "iso-8601"},
+        "remaining_retention_days": {"key": "properties.remainingRetentionDays", "type": "int"},
+        "default_encryption_scope": {"key": "properties.defaultEncryptionScope", "type": "str"},
+        "deny_encryption_scope_override": {"key": "properties.denyEncryptionScopeOverride", "type": "bool"},
+        "public_access": {"key": "properties.publicAccess", "type": "str"},
+        "last_modified_time": {"key": "properties.lastModifiedTime", "type": "iso-8601"},
+        "lease_status": {"key": "properties.leaseStatus", "type": "str"},
+        "lease_state": {"key": "properties.leaseState", "type": "str"},
+        "lease_duration": {"key": "properties.leaseDuration", "type": "str"},
+        "metadata": {"key": "properties.metadata", "type": "{str}"},
+        "immutability_policy": {"key": "properties.immutabilityPolicy", "type": "ImmutabilityPolicyProperties"},
+        "legal_hold": {"key": "properties.legalHold", "type": "LegalHoldProperties"},
+        "has_legal_hold": {"key": "properties.hasLegalHold", "type": "bool"},
+        "has_immutability_policy": {"key": "properties.hasImmutabilityPolicy", "type": "bool"},
+        "immutable_storage_with_versioning": {
+            "key": "properties.immutableStorageWithVersioning",
+            "type": "ImmutableStorageWithVersioning",
+        },
+        "enable_nfs_v3_root_squash": {"key": "properties.enableNfsV3RootSquash", "type": "bool"},
+        "enable_nfs_v3_all_squash": {"key": "properties.enableNfsV3AllSquash", "type": "bool"},
+    }
+
+    def __init__(
+        self,
+        *,
+        default_encryption_scope: Optional[str] = None,
+        deny_encryption_scope_override: Optional[bool] = None,
+        public_access: Optional[Union[str, "_models.PublicAccess"]] = None,
+        metadata: Optional[Dict[str, str]] = None,
+        immutable_storage_with_versioning: Optional["_models.ImmutableStorageWithVersioning"] = None,
+        enable_nfs_v3_root_squash: Optional[bool] = None,
+        enable_nfs_v3_all_squash: Optional[bool] = None,
+        **kwargs: Any
+    ) -> None:
+        """
+        :keyword default_encryption_scope: Default the container to use specified encryption scope for
+         all writes.
+        :paramtype default_encryption_scope: str
+        :keyword deny_encryption_scope_override: Block override of encryption scope from the container
+         default.
+        :paramtype deny_encryption_scope_override: bool
+        :keyword public_access: Specifies whether data in the container may be accessed publicly and
+         the level of access. Known values are: "Container", "Blob", and "None".
+        :paramtype public_access: str or ~azure.mgmt.storage.v2024_01_01.models.PublicAccess
+        :keyword metadata: A name-value pair to associate with the container as metadata.
+        :paramtype metadata: dict[str, str]
+        :keyword immutable_storage_with_versioning: The object level immutability property of the
+         container. The property is immutable and can only be set to true at the container creation
+         time. Existing containers must undergo a migration process.
+        :paramtype immutable_storage_with_versioning:
+         ~azure.mgmt.storage.v2024_01_01.models.ImmutableStorageWithVersioning
+        :keyword enable_nfs_v3_root_squash: Enable NFSv3 root squash on blob container.
+        :paramtype enable_nfs_v3_root_squash: bool
+        :keyword enable_nfs_v3_all_squash: Enable NFSv3 all squash on blob container.
+        :paramtype enable_nfs_v3_all_squash: bool
+        """
+        super().__init__(**kwargs)
+        self.version = None
+        self.deleted = None
+        self.deleted_time = None
+        self.remaining_retention_days = None
+        self.default_encryption_scope = default_encryption_scope
+        self.deny_encryption_scope_override = deny_encryption_scope_override
+        self.public_access = public_access
+        self.last_modified_time = None
+        self.lease_status = None
+        self.lease_state = None
+        self.lease_duration = None
+        self.metadata = metadata
+        self.immutability_policy = None
+        self.legal_hold = None
+        self.has_legal_hold = None
+        self.has_immutability_policy = None
+        self.immutable_storage_with_versioning = immutable_storage_with_versioning
+        self.enable_nfs_v3_root_squash = enable_nfs_v3_root_squash
+        self.enable_nfs_v3_all_squash = enable_nfs_v3_all_squash
+
+
+class ListContainerItems(_serialization.Model):
+    """Response schema. Contains list of blobs returned, and if paging is requested or required, a URL
+    to next page of containers.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar value: List of blobs containers returned.
+    :vartype value: list[~azure.mgmt.storage.v2024_01_01.models.ListContainerItem]
+    :ivar next_link: Request URL that can be used to query next page of containers. Returned when
+     total number of requested containers exceed maximum page size.
+    :vartype next_link: str
+    """
+
+    _validation = {
+        "value": {"readonly": True},
+        "next_link": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "value": {"key": "value", "type": "[ListContainerItem]"},
+        "next_link": {"key": "nextLink", "type": "str"},
+    }
+
+    def __init__(self, **kwargs: Any) -> None:
+        """ """
+        super().__init__(**kwargs)
+        self.value = None
+        self.next_link = None
+
+
+class ListQueue(Resource):
+    """ListQueue.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar id: Fully qualified resource ID for the resource. Ex -
+     /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}.  # pylint: disable=line-too-long
+    :vartype id: str
+    :ivar name: The name of the resource.
+    :vartype name: str
+    :ivar type: The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or
+     "Microsoft.Storage/storageAccounts".
+    :vartype type: str
+    :ivar metadata: A name-value pair that represents queue metadata.
+    :vartype metadata: dict[str, str]
+    """
+
+    _validation = {
+        "id": {"readonly": True},
+        "name": {"readonly": True},
+        "type": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "id": {"key": "id", "type": "str"},
+        "name": {"key": "name", "type": "str"},
+        "type": {"key": "type", "type": "str"},
+        "metadata": {"key": "properties.metadata", "type": "{str}"},
+    }
+
+    def __init__(self, *, metadata: Optional[Dict[str, str]] = None, **kwargs: Any) -> None:
+        """
+        :keyword metadata: A name-value pair that represents queue metadata.
+        :paramtype metadata: dict[str, str]
+        """
+        super().__init__(**kwargs)
+        self.metadata = metadata
+
+
+class ListQueueResource(_serialization.Model):
+    """Response schema. Contains list of queues returned.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar value: List of queues returned.
+    :vartype value: list[~azure.mgmt.storage.v2024_01_01.models.ListQueue]
+    :ivar next_link: Request URL that can be used to list next page of queues.
+    :vartype next_link: str
+    """
+
+    _validation = {
+        "value": {"readonly": True},
+        "next_link": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "value": {"key": "value", "type": "[ListQueue]"},
+        "next_link": {"key": "nextLink", "type": "str"},
+    }
+
+    def __init__(self, **kwargs: Any) -> None:
+        """ """
+        super().__init__(**kwargs)
+        self.value = None
+        self.next_link = None
+
+
+class ListQueueServices(_serialization.Model):
+    """ListQueueServices.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar value: List of queue services returned.
+    :vartype value: list[~azure.mgmt.storage.v2024_01_01.models.QueueServiceProperties]
+    """
+
+    _validation = {
+        "value": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "value": {"key": "value", "type": "[QueueServiceProperties]"},
+    }
+
+    def __init__(self, **kwargs: Any) -> None:
+        """ """
+        super().__init__(**kwargs)
+        self.value = None
+
+
+class ListServiceSasResponse(_serialization.Model):
+    """The List service SAS credentials operation response.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar service_sas_token: List service SAS credentials of specific resource.
+    :vartype service_sas_token: str
+    """
+
+    _validation = {
+        "service_sas_token": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "service_sas_token": {"key": "serviceSasToken", "type": "str"},
+    }
+
+    def __init__(self, **kwargs: Any) -> None:
+        """ """
+        super().__init__(**kwargs)
+        self.service_sas_token = None
+
+
+class ListTableResource(_serialization.Model):
+    """Response schema. Contains list of tables returned.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar value: List of tables returned.
+    :vartype value: list[~azure.mgmt.storage.v2024_01_01.models.Table]
+    :ivar next_link: Request URL that can be used to query next page of tables.
+    :vartype next_link: str
+    """
+
+    _validation = {
+        "value": {"readonly": True},
+        "next_link": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "value": {"key": "value", "type": "[Table]"},
+        "next_link": {"key": "nextLink", "type": "str"},
+    }
+
+    def __init__(self, **kwargs: Any) -> None:
+        """ """
+        super().__init__(**kwargs)
+        self.value = None
+        self.next_link = None
+
+
+class ListTableServices(_serialization.Model):
+    """ListTableServices.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar value: List of table services returned.
+    :vartype value: list[~azure.mgmt.storage.v2024_01_01.models.TableServiceProperties]
+    """
+
+    _validation = {
+        "value": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "value": {"key": "value", "type": "[TableServiceProperties]"},
+    }
+
+    def __init__(self, **kwargs: Any) -> None:
+        """ """
+        super().__init__(**kwargs)
+        self.value = None
+
+
+class LocalUser(Resource):
+    """The local user associated with the storage accounts.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar id: Fully qualified resource ID for the resource. Ex -
+     /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}.  # pylint: disable=line-too-long
+    :vartype id: str
+    :ivar name: The name of the resource.
+    :vartype name: str
+    :ivar type: The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or
+     "Microsoft.Storage/storageAccounts".
+    :vartype type: str
+    :ivar system_data: Metadata pertaining to creation and last modification of the resource.
+    :vartype system_data: ~azure.mgmt.storage.v2024_01_01.models.SystemData
+    :ivar permission_scopes: The permission scopes of the local user.
+    :vartype permission_scopes: list[~azure.mgmt.storage.v2024_01_01.models.PermissionScope]
+    :ivar home_directory: Optional, local user home directory.
+    :vartype home_directory: str
+    :ivar ssh_authorized_keys: Optional, local user ssh authorized keys for SFTP.
+    :vartype ssh_authorized_keys: list[~azure.mgmt.storage.v2024_01_01.models.SshPublicKey]
+    :ivar sid: A unique Security Identifier that is generated by the server.
+    :vartype sid: str
+    :ivar has_shared_key: Indicates whether shared key exists. Set it to false to remove existing
+     shared key.
+    :vartype has_shared_key: bool
+    :ivar has_ssh_key: Indicates whether ssh key exists. Set it to false to remove existing SSH
+     key.
+    :vartype has_ssh_key: bool
+    :ivar has_ssh_password: Indicates whether ssh password exists. Set it to false to remove
+     existing SSH password.
+    :vartype has_ssh_password: bool
+    :ivar user_id: A unique Identifier that is generated by the server.
+    :vartype user_id: int
+    :ivar group_id: An identifier for associating a group of users.
+    :vartype group_id: int
+    :ivar allow_acl_authorization: Indicates whether ACL authorization is allowed for this user.
+     Set it to false to disallow using ACL authorization.
+    :vartype allow_acl_authorization: bool
+    :ivar extended_groups: Supplementary group membership. Only applicable for local users enabled
+     for NFSv3 access.
+    :vartype extended_groups: list[int]
+    :ivar is_nf_sv3_enabled: Indicates if the local user is enabled for access with NFSv3 protocol.
+    :vartype is_nf_sv3_enabled: bool
+    """
+
+    _validation = {
+        "id": {"readonly": True},
+        "name": {"readonly": True},
+        "type": {"readonly": True},
+        "system_data": {"readonly": True},
+        "sid": {"readonly": True},
+        "user_id": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "id": {"key": "id", "type": "str"},
+        "name": {"key": "name", "type": "str"},
+        "type": {"key": "type", "type": "str"},
+        "system_data": {"key": "systemData", "type": "SystemData"},
+        "permission_scopes": {"key": "properties.permissionScopes", "type": "[PermissionScope]"},
+        "home_directory": {"key": "properties.homeDirectory", "type": "str"},
+        "ssh_authorized_keys": {"key": "properties.sshAuthorizedKeys", "type": "[SshPublicKey]"},
+        "sid": {"key": "properties.sid", "type": "str"},
+        "has_shared_key": {"key": "properties.hasSharedKey", "type": "bool"},
+        "has_ssh_key": {"key": "properties.hasSshKey", "type": "bool"},
+        "has_ssh_password": {"key": "properties.hasSshPassword", "type": "bool"},
+        "user_id": {"key": "properties.userId", "type": "int"},
+        "group_id": {"key": "properties.groupId", "type": "int"},
+        "allow_acl_authorization": {"key": "properties.allowAclAuthorization", "type": "bool"},
+        "extended_groups": {"key": "properties.extendedGroups", "type": "[int]"},
+        "is_nf_sv3_enabled": {"key": "properties.isNFSv3Enabled", "type": "bool"},
+    }
+
+    def __init__(
+        self,
+        *,
+        permission_scopes: Optional[List["_models.PermissionScope"]] = None,
+        home_directory: Optional[str] = None,
+        ssh_authorized_keys: Optional[List["_models.SshPublicKey"]] = None,
+        has_shared_key: Optional[bool] = None,
+        has_ssh_key: Optional[bool] = None,
+        has_ssh_password: Optional[bool] = None,
+        group_id: Optional[int] = None,
+        allow_acl_authorization: Optional[bool] = None,
+        extended_groups: Optional[List[int]] = None,
+        is_nf_sv3_enabled: Optional[bool] = None,
+        **kwargs: Any
+    ) -> None:
+        """
+        :keyword permission_scopes: The permission scopes of the local user.
+        :paramtype permission_scopes: list[~azure.mgmt.storage.v2024_01_01.models.PermissionScope]
+        :keyword home_directory: Optional, local user home directory.
+        :paramtype home_directory: str
+        :keyword ssh_authorized_keys: Optional, local user ssh authorized keys for SFTP.
+        :paramtype ssh_authorized_keys: list[~azure.mgmt.storage.v2024_01_01.models.SshPublicKey]
+        :keyword has_shared_key: Indicates whether shared key exists. Set it to false to remove
+         existing shared key.
+        :paramtype has_shared_key: bool
+        :keyword has_ssh_key: Indicates whether ssh key exists. Set it to false to remove existing SSH
+         key.
+        :paramtype has_ssh_key: bool
+        :keyword has_ssh_password: Indicates whether ssh password exists. Set it to false to remove
+         existing SSH password.
+        :paramtype has_ssh_password: bool
+        :keyword group_id: An identifier for associating a group of users.
+        :paramtype group_id: int
+        :keyword allow_acl_authorization: Indicates whether ACL authorization is allowed for this user.
+         Set it to false to disallow using ACL authorization.
+        :paramtype allow_acl_authorization: bool
+        :keyword extended_groups: Supplementary group membership. Only applicable for local users
+         enabled for NFSv3 access.
+        :paramtype extended_groups: list[int]
+        :keyword is_nf_sv3_enabled: Indicates if the local user is enabled for access with NFSv3
+         protocol.
+        :paramtype is_nf_sv3_enabled: bool
+        """
+        super().__init__(**kwargs)
+        self.system_data = None
+        self.permission_scopes = permission_scopes
+        self.home_directory = home_directory
+        self.ssh_authorized_keys = ssh_authorized_keys
+        self.sid = None
+        self.has_shared_key = has_shared_key
+        self.has_ssh_key = has_ssh_key
+        self.has_ssh_password = has_ssh_password
+        self.user_id = None
+        self.group_id = group_id
+        self.allow_acl_authorization = allow_acl_authorization
+        self.extended_groups = extended_groups
+        self.is_nf_sv3_enabled = is_nf_sv3_enabled
+
+
+class LocalUserKeys(_serialization.Model):
+    """The Storage Account Local User keys.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar ssh_authorized_keys: Optional, local user ssh authorized keys for SFTP.
+    :vartype ssh_authorized_keys: list[~azure.mgmt.storage.v2024_01_01.models.SshPublicKey]
+    :ivar shared_key: Auto generated by the server for SMB authentication.
+    :vartype shared_key: str
+    """
+
+    _validation = {
+        "shared_key": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "ssh_authorized_keys": {"key": "sshAuthorizedKeys", "type": "[SshPublicKey]"},
+        "shared_key": {"key": "sharedKey", "type": "str"},
+    }
+
+    def __init__(self, *, ssh_authorized_keys: Optional[List["_models.SshPublicKey"]] = None, **kwargs: Any) -> None:
+        """
+        :keyword ssh_authorized_keys: Optional, local user ssh authorized keys for SFTP.
+        :paramtype ssh_authorized_keys: list[~azure.mgmt.storage.v2024_01_01.models.SshPublicKey]
+        """
+        super().__init__(**kwargs)
+        self.ssh_authorized_keys = ssh_authorized_keys
+        self.shared_key = None
+
+
+class LocalUserRegeneratePasswordResult(_serialization.Model):
+    """The secrets of Storage Account Local User.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar ssh_password: Auto generated password by the server for SSH authentication if
+     hasSshPassword is set to true on the creation of local user.
+    :vartype ssh_password: str
+    """
+
+    _validation = {
+        "ssh_password": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "ssh_password": {"key": "sshPassword", "type": "str"},
+    }
+
+    def __init__(self, **kwargs: Any) -> None:
+        """ """
+        super().__init__(**kwargs)
+        self.ssh_password = None
+
+
+class LocalUsers(_serialization.Model):
+    """List of local users requested, and if paging is required, a URL to the next page of local
+    users.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar value: The list of local users associated with the storage account.
+    :vartype value: list[~azure.mgmt.storage.v2024_01_01.models.LocalUser]
+    :ivar next_link: Request URL that can be used to query next page of local users. Returned when
+     total number of requested local users exceeds the maximum page size.
+    :vartype next_link: str
+    """
+
+    _validation = {
+        "next_link": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "value": {"key": "value", "type": "[LocalUser]"},
+        "next_link": {"key": "nextLink", "type": "str"},
+    }
+
+    def __init__(self, *, value: Optional[List["_models.LocalUser"]] = None, **kwargs: Any) -> None:
+        """
+        :keyword value: The list of local users associated with the storage account.
+        :paramtype value: list[~azure.mgmt.storage.v2024_01_01.models.LocalUser]
+        """
+        super().__init__(**kwargs)
+        self.value = value
+        self.next_link = None
+
+
+class ManagementPolicy(Resource):
+    """The Get Storage Account ManagementPolicies operation response.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar id: Fully qualified resource ID for the resource. Ex -
+     /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}.  # pylint: disable=line-too-long
+    :vartype id: str
+    :ivar name: The name of the resource.
+    :vartype name: str
+    :ivar type: The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or
+     "Microsoft.Storage/storageAccounts".
+    :vartype type: str
+    :ivar last_modified_time: Returns the date and time the ManagementPolicies was last modified.
+    :vartype last_modified_time: ~datetime.datetime
+    :ivar policy: The Storage Account ManagementPolicy, in JSON format. See more details in:
+     https://docs.microsoft.com/en-us/azure/storage/common/storage-lifecycle-managment-concepts.
+    :vartype policy: ~azure.mgmt.storage.v2024_01_01.models.ManagementPolicySchema
+    """
+
+    _validation = {
+        "id": {"readonly": True},
+        "name": {"readonly": True},
+        "type": {"readonly": True},
+        "last_modified_time": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "id": {"key": "id", "type": "str"},
+        "name": {"key": "name", "type": "str"},
+        "type": {"key": "type", "type": "str"},
+        "last_modified_time": {"key": "properties.lastModifiedTime", "type": "iso-8601"},
+        "policy": {"key": "properties.policy", "type": "ManagementPolicySchema"},
+    }
+
+    def __init__(self, *, policy: Optional["_models.ManagementPolicySchema"] = None, **kwargs: Any) -> None:
+        """
+        :keyword policy: The Storage Account ManagementPolicy, in JSON format. See more details in:
+         https://docs.microsoft.com/en-us/azure/storage/common/storage-lifecycle-managment-concepts.
+        :paramtype policy: ~azure.mgmt.storage.v2024_01_01.models.ManagementPolicySchema
+        """
+        super().__init__(**kwargs)
+        self.last_modified_time = None
+        self.policy = policy
+
+
+class ManagementPolicyAction(_serialization.Model):
+    """Actions are applied to the filtered blobs when the execution condition is met.
+
+    :ivar base_blob: The management policy action for base blob.
+    :vartype base_blob: ~azure.mgmt.storage.v2024_01_01.models.ManagementPolicyBaseBlob
+    :ivar snapshot: The management policy action for snapshot.
+    :vartype snapshot: ~azure.mgmt.storage.v2024_01_01.models.ManagementPolicySnapShot
+    :ivar version: The management policy action for version.
+    :vartype version: ~azure.mgmt.storage.v2024_01_01.models.ManagementPolicyVersion
+    """
+
+    _attribute_map = {
+        "base_blob": {"key": "baseBlob", "type": "ManagementPolicyBaseBlob"},
+        "snapshot": {"key": "snapshot", "type": "ManagementPolicySnapShot"},
+        "version": {"key": "version", "type": "ManagementPolicyVersion"},
+    }
+
+    def __init__(
+        self,
+        *,
+        base_blob: Optional["_models.ManagementPolicyBaseBlob"] = None,
+        snapshot: Optional["_models.ManagementPolicySnapShot"] = None,
+        version: Optional["_models.ManagementPolicyVersion"] = None,
+        **kwargs: Any
+    ) -> None:
+        """
+        :keyword base_blob: The management policy action for base blob.
+        :paramtype base_blob: ~azure.mgmt.storage.v2024_01_01.models.ManagementPolicyBaseBlob
+        :keyword snapshot: The management policy action for snapshot.
+        :paramtype snapshot: ~azure.mgmt.storage.v2024_01_01.models.ManagementPolicySnapShot
+        :keyword version: The management policy action for version.
+        :paramtype version: ~azure.mgmt.storage.v2024_01_01.models.ManagementPolicyVersion
+        """
+        super().__init__(**kwargs)
+        self.base_blob = base_blob
+        self.snapshot = snapshot
+        self.version = version
+
+
+class ManagementPolicyBaseBlob(_serialization.Model):
+    """Management policy action for base blob.
+
+    :ivar tier_to_cool: The function to tier blobs to cool storage.
+    :vartype tier_to_cool: ~azure.mgmt.storage.v2024_01_01.models.DateAfterModification
+    :ivar tier_to_archive: The function to tier blobs to archive storage.
+    :vartype tier_to_archive: ~azure.mgmt.storage.v2024_01_01.models.DateAfterModification
+    :ivar tier_to_cold: The function to tier blobs to cold storage.
+    :vartype tier_to_cold: ~azure.mgmt.storage.v2024_01_01.models.DateAfterModification
+    :ivar tier_to_hot: The function to tier blobs to hot storage. This action can only be used with
+     Premium Block Blob Storage Accounts.
+    :vartype tier_to_hot: ~azure.mgmt.storage.v2024_01_01.models.DateAfterModification
+    :ivar delete: The function to delete the blob.
+    :vartype delete: ~azure.mgmt.storage.v2024_01_01.models.DateAfterModification
+    :ivar enable_auto_tier_to_hot_from_cool: This property enables auto tiering of a blob from cool
+     to hot on a blob access. This property requires tierToCool.daysAfterLastAccessTimeGreaterThan.
+    :vartype enable_auto_tier_to_hot_from_cool: bool
+    """
+
+    _attribute_map = {
+        "tier_to_cool": {"key": "tierToCool", "type": "DateAfterModification"},
+        "tier_to_archive": {"key": "tierToArchive", "type": "DateAfterModification"},
+        "tier_to_cold": {"key": "tierToCold", "type": "DateAfterModification"},
+        "tier_to_hot": {"key": "tierToHot", "type": "DateAfterModification"},
+        "delete": {"key": "delete", "type": "DateAfterModification"},
+        "enable_auto_tier_to_hot_from_cool": {"key": "enableAutoTierToHotFromCool", "type": "bool"},
+    }
+
+    def __init__(
+        self,
+        *,
+        tier_to_cool: Optional["_models.DateAfterModification"] = None,
+        tier_to_archive: Optional["_models.DateAfterModification"] = None,
+        tier_to_cold: Optional["_models.DateAfterModification"] = None,
+        tier_to_hot: Optional["_models.DateAfterModification"] = None,
+        delete: Optional["_models.DateAfterModification"] = None,
+        enable_auto_tier_to_hot_from_cool: Optional[bool] = None,
+        **kwargs: Any
+    ) -> None:
+        """
+        :keyword tier_to_cool: The function to tier blobs to cool storage.
+        :paramtype tier_to_cool: ~azure.mgmt.storage.v2024_01_01.models.DateAfterModification
+        :keyword tier_to_archive: The function to tier blobs to archive storage.
+        :paramtype tier_to_archive: ~azure.mgmt.storage.v2024_01_01.models.DateAfterModification
+        :keyword tier_to_cold: The function to tier blobs to cold storage.
+        :paramtype tier_to_cold: ~azure.mgmt.storage.v2024_01_01.models.DateAfterModification
+        :keyword tier_to_hot: The function to tier blobs to hot storage. This action can only be used
+         with Premium Block Blob Storage Accounts.
+        :paramtype tier_to_hot: ~azure.mgmt.storage.v2024_01_01.models.DateAfterModification
+        :keyword delete: The function to delete the blob.
+        :paramtype delete: ~azure.mgmt.storage.v2024_01_01.models.DateAfterModification
+        :keyword enable_auto_tier_to_hot_from_cool: This property enables auto tiering of a blob from
+         cool to hot on a blob access. This property requires
+         tierToCool.daysAfterLastAccessTimeGreaterThan.
+        :paramtype enable_auto_tier_to_hot_from_cool: bool
+        """
+        super().__init__(**kwargs)
+        self.tier_to_cool = tier_to_cool
+        self.tier_to_archive = tier_to_archive
+        self.tier_to_cold = tier_to_cold
+        self.tier_to_hot = tier_to_hot
+        self.delete = delete
+        self.enable_auto_tier_to_hot_from_cool = enable_auto_tier_to_hot_from_cool
+
+
+class ManagementPolicyDefinition(_serialization.Model):
+    """An object that defines the Lifecycle rule. Each definition is made up with a filters set and an
+    actions set.
+
+    All required parameters must be populated in order to send to server.
+
+    :ivar actions: An object that defines the action set. Required.
+    :vartype actions: ~azure.mgmt.storage.v2024_01_01.models.ManagementPolicyAction
+    :ivar filters: An object that defines the filter set.
+    :vartype filters: ~azure.mgmt.storage.v2024_01_01.models.ManagementPolicyFilter
+    """
+
+    _validation = {
+        "actions": {"required": True},
+    }
+
+    _attribute_map = {
+        "actions": {"key": "actions", "type": "ManagementPolicyAction"},
+        "filters": {"key": "filters", "type": "ManagementPolicyFilter"},
+    }
+
+    def __init__(
+        self,
+        *,
+        actions: "_models.ManagementPolicyAction",
+        filters: Optional["_models.ManagementPolicyFilter"] = None,
+        **kwargs: Any
+    ) -> None:
+        """
+        :keyword actions: An object that defines the action set. Required.
+        :paramtype actions: ~azure.mgmt.storage.v2024_01_01.models.ManagementPolicyAction
+        :keyword filters: An object that defines the filter set.
+        :paramtype filters: ~azure.mgmt.storage.v2024_01_01.models.ManagementPolicyFilter
+        """
+        super().__init__(**kwargs)
+        self.actions = actions
+        self.filters = filters
+
+
+class ManagementPolicyFilter(_serialization.Model):
+    """Filters limit rule actions to a subset of blobs within the storage account. If multiple filters
+    are defined, a logical AND is performed on all filters.
+
+    All required parameters must be populated in order to send to server.
+
+    :ivar prefix_match: An array of strings for prefixes to be match.
+    :vartype prefix_match: list[str]
+    :ivar blob_types: An array of predefined enum values. Currently blockBlob supports all tiering
+     and delete actions. Only delete actions are supported for appendBlob. Required.
+    :vartype blob_types: list[str]
+    :ivar blob_index_match: An array of blob index tag based filters, there can be at most 10 tag
+     filters.
+    :vartype blob_index_match: list[~azure.mgmt.storage.v2024_01_01.models.TagFilter]
+    """
+
+    _validation = {
+        "blob_types": {"required": True},
+    }
+
+    _attribute_map = {
+        "prefix_match": {"key": "prefixMatch", "type": "[str]"},
+        "blob_types": {"key": "blobTypes", "type": "[str]"},
+        "blob_index_match": {"key": "blobIndexMatch", "type": "[TagFilter]"},
+    }
+
+    def __init__(
+        self,
+        *,
+        blob_types: List[str],
+        prefix_match: Optional[List[str]] = None,
+        blob_index_match: Optional[List["_models.TagFilter"]] = None,
+        **kwargs: Any
+    ) -> None:
+        """
+        :keyword prefix_match: An array of strings for prefixes to be match.
+        :paramtype prefix_match: list[str]
+        :keyword blob_types: An array of predefined enum values. Currently blockBlob supports all
+         tiering and delete actions. Only delete actions are supported for appendBlob. Required.
+        :paramtype blob_types: list[str]
+        :keyword blob_index_match: An array of blob index tag based filters, there can be at most 10
+         tag filters.
+        :paramtype blob_index_match: list[~azure.mgmt.storage.v2024_01_01.models.TagFilter]
+        """
+        super().__init__(**kwargs)
+        self.prefix_match = prefix_match
+        self.blob_types = blob_types
+        self.blob_index_match = blob_index_match
+
+
+class ManagementPolicyRule(_serialization.Model):
+    """An object that wraps the Lifecycle rule. Each rule is uniquely defined by name.
+
+    All required parameters must be populated in order to send to server.
+
+    :ivar enabled: Rule is enabled if set to true.
+    :vartype enabled: bool
+    :ivar name: A rule name can contain any combination of alpha numeric characters. Rule name is
+     case-sensitive. It must be unique within a policy. Required.
+    :vartype name: str
+    :ivar type: The valid value is Lifecycle. Required. "Lifecycle"
+    :vartype type: str or ~azure.mgmt.storage.v2024_01_01.models.RuleType
+    :ivar definition: An object that defines the Lifecycle rule. Required.
+    :vartype definition: ~azure.mgmt.storage.v2024_01_01.models.ManagementPolicyDefinition
+    """
+
+    _validation = {
+        "name": {"required": True},
+        "type": {"required": True},
+        "definition": {"required": True},
+    }
+
+    _attribute_map = {
+        "enabled": {"key": "enabled", "type": "bool"},
+        "name": {"key": "name", "type": "str"},
+        "type": {"key": "type", "type": "str"},
+        "definition": {"key": "definition", "type": "ManagementPolicyDefinition"},
+    }
+
+    def __init__(
+        self,
+        *,
+        name: str,
+        type: Union[str, "_models.RuleType"],
+        definition: "_models.ManagementPolicyDefinition",
+        enabled: Optional[bool] = None,
+        **kwargs: Any
+    ) -> None:
+        """
+        :keyword enabled: Rule is enabled if set to true.
+        :paramtype enabled: bool
+        :keyword name: A rule name can contain any combination of alpha numeric characters. Rule name
+         is case-sensitive. It must be unique within a policy. Required.
+        :paramtype name: str
+        :keyword type: The valid value is Lifecycle. Required. "Lifecycle"
+        :paramtype type: str or ~azure.mgmt.storage.v2024_01_01.models.RuleType
+        :keyword definition: An object that defines the Lifecycle rule. Required.
+        :paramtype definition: ~azure.mgmt.storage.v2024_01_01.models.ManagementPolicyDefinition
+        """
+        super().__init__(**kwargs)
+        self.enabled = enabled
+        self.name = name
+        self.type = type
+        self.definition = definition
+
+
+class ManagementPolicySchema(_serialization.Model):
+    """The Storage Account ManagementPolicies Rules. See more details in:
+    https://docs.microsoft.com/en-us/azure/storage/common/storage-lifecycle-managment-concepts.
+
+    All required parameters must be populated in order to send to server.
+
+    :ivar rules: The Storage Account ManagementPolicies Rules. See more details in:
+     https://docs.microsoft.com/en-us/azure/storage/common/storage-lifecycle-managment-concepts.
+     Required.
+    :vartype rules: list[~azure.mgmt.storage.v2024_01_01.models.ManagementPolicyRule]
+    """
+
+    _validation = {
+        "rules": {"required": True},
+    }
+
+    _attribute_map = {
+        "rules": {"key": "rules", "type": "[ManagementPolicyRule]"},
+    }
+
+    def __init__(self, *, rules: List["_models.ManagementPolicyRule"], **kwargs: Any) -> None:
+        """
+        :keyword rules: The Storage Account ManagementPolicies Rules. See more details in:
+         https://docs.microsoft.com/en-us/azure/storage/common/storage-lifecycle-managment-concepts.
+         Required.
+        :paramtype rules: list[~azure.mgmt.storage.v2024_01_01.models.ManagementPolicyRule]
+        """
+        super().__init__(**kwargs)
+        self.rules = rules
+
+
+class ManagementPolicySnapShot(_serialization.Model):
+    """Management policy action for snapshot.
+
+    :ivar tier_to_cool: The function to tier blob snapshot to cool storage.
+    :vartype tier_to_cool: ~azure.mgmt.storage.v2024_01_01.models.DateAfterCreation
+    :ivar tier_to_archive: The function to tier blob snapshot to archive storage.
+    :vartype tier_to_archive: ~azure.mgmt.storage.v2024_01_01.models.DateAfterCreation
+    :ivar tier_to_cold: The function to tier blobs to cold storage.
+    :vartype tier_to_cold: ~azure.mgmt.storage.v2024_01_01.models.DateAfterCreation
+    :ivar tier_to_hot: The function to tier blobs to hot storage. This action can only be used with
+     Premium Block Blob Storage Accounts.
+    :vartype tier_to_hot: ~azure.mgmt.storage.v2024_01_01.models.DateAfterCreation
+    :ivar delete: The function to delete the blob snapshot.
+    :vartype delete: ~azure.mgmt.storage.v2024_01_01.models.DateAfterCreation
+    """
+
+    _attribute_map = {
+        "tier_to_cool": {"key": "tierToCool", "type": "DateAfterCreation"},
+        "tier_to_archive": {"key": "tierToArchive", "type": "DateAfterCreation"},
+        "tier_to_cold": {"key": "tierToCold", "type": "DateAfterCreation"},
+        "tier_to_hot": {"key": "tierToHot", "type": "DateAfterCreation"},
+        "delete": {"key": "delete", "type": "DateAfterCreation"},
+    }
+
+    def __init__(
+        self,
+        *,
+        tier_to_cool: Optional["_models.DateAfterCreation"] = None,
+        tier_to_archive: Optional["_models.DateAfterCreation"] = None,
+        tier_to_cold: Optional["_models.DateAfterCreation"] = None,
+        tier_to_hot: Optional["_models.DateAfterCreation"] = None,
+        delete: Optional["_models.DateAfterCreation"] = None,
+        **kwargs: Any
+    ) -> None:
+        """
+        :keyword tier_to_cool: The function to tier blob snapshot to cool storage.
+        :paramtype tier_to_cool: ~azure.mgmt.storage.v2024_01_01.models.DateAfterCreation
+        :keyword tier_to_archive: The function to tier blob snapshot to archive storage.
+        :paramtype tier_to_archive: ~azure.mgmt.storage.v2024_01_01.models.DateAfterCreation
+        :keyword tier_to_cold: The function to tier blobs to cold storage.
+        :paramtype tier_to_cold: ~azure.mgmt.storage.v2024_01_01.models.DateAfterCreation
+        :keyword tier_to_hot: The function to tier blobs to hot storage. This action can only be used
+         with Premium Block Blob Storage Accounts.
+        :paramtype tier_to_hot: ~azure.mgmt.storage.v2024_01_01.models.DateAfterCreation
+        :keyword delete: The function to delete the blob snapshot.
+        :paramtype delete: ~azure.mgmt.storage.v2024_01_01.models.DateAfterCreation
+        """
+        super().__init__(**kwargs)
+        self.tier_to_cool = tier_to_cool
+        self.tier_to_archive = tier_to_archive
+        self.tier_to_cold = tier_to_cold
+        self.tier_to_hot = tier_to_hot
+        self.delete = delete
+
+
+class ManagementPolicyVersion(_serialization.Model):
+    """Management policy action for blob version.
+
+    :ivar tier_to_cool: The function to tier blob version to cool storage.
+    :vartype tier_to_cool: ~azure.mgmt.storage.v2024_01_01.models.DateAfterCreation
+    :ivar tier_to_archive: The function to tier blob version to archive storage.
+    :vartype tier_to_archive: ~azure.mgmt.storage.v2024_01_01.models.DateAfterCreation
+    :ivar tier_to_cold: The function to tier blobs to cold storage.
+    :vartype tier_to_cold: ~azure.mgmt.storage.v2024_01_01.models.DateAfterCreation
+    :ivar tier_to_hot: The function to tier blobs to hot storage. This action can only be used with
+     Premium Block Blob Storage Accounts.
+    :vartype tier_to_hot: ~azure.mgmt.storage.v2024_01_01.models.DateAfterCreation
+    :ivar delete: The function to delete the blob version.
+    :vartype delete: ~azure.mgmt.storage.v2024_01_01.models.DateAfterCreation
+    """
+
+    _attribute_map = {
+        "tier_to_cool": {"key": "tierToCool", "type": "DateAfterCreation"},
+        "tier_to_archive": {"key": "tierToArchive", "type": "DateAfterCreation"},
+        "tier_to_cold": {"key": "tierToCold", "type": "DateAfterCreation"},
+        "tier_to_hot": {"key": "tierToHot", "type": "DateAfterCreation"},
+        "delete": {"key": "delete", "type": "DateAfterCreation"},
+    }
+
+    def __init__(
+        self,
+        *,
+        tier_to_cool: Optional["_models.DateAfterCreation"] = None,
+        tier_to_archive: Optional["_models.DateAfterCreation"] = None,
+        tier_to_cold: Optional["_models.DateAfterCreation"] = None,
+        tier_to_hot: Optional["_models.DateAfterCreation"] = None,
+        delete: Optional["_models.DateAfterCreation"] = None,
+        **kwargs: Any
+    ) -> None:
+        """
+        :keyword tier_to_cool: The function to tier blob version to cool storage.
+        :paramtype tier_to_cool: ~azure.mgmt.storage.v2024_01_01.models.DateAfterCreation
+        :keyword tier_to_archive: The function to tier blob version to archive storage.
+        :paramtype tier_to_archive: ~azure.mgmt.storage.v2024_01_01.models.DateAfterCreation
+        :keyword tier_to_cold: The function to tier blobs to cold storage.
+        :paramtype tier_to_cold: ~azure.mgmt.storage.v2024_01_01.models.DateAfterCreation
+        :keyword tier_to_hot: The function to tier blobs to hot storage. This action can only be used
+         with Premium Block Blob Storage Accounts.
+        :paramtype tier_to_hot: ~azure.mgmt.storage.v2024_01_01.models.DateAfterCreation
+        :keyword delete: The function to delete the blob version.
+        :paramtype delete: ~azure.mgmt.storage.v2024_01_01.models.DateAfterCreation
+        """
+        super().__init__(**kwargs)
+        self.tier_to_cool = tier_to_cool
+        self.tier_to_archive = tier_to_archive
+        self.tier_to_cold = tier_to_cold
+        self.tier_to_hot = tier_to_hot
+        self.delete = delete
+
+
+class MetricSpecification(_serialization.Model):
+    """Metric specification of operation.
+
+    :ivar name: Name of metric specification.
+    :vartype name: str
+    :ivar display_name: Display name of metric specification.
+    :vartype display_name: str
+    :ivar display_description: Display description of metric specification.
+    :vartype display_description: str
+    :ivar unit: Unit could be Bytes or Count.
+    :vartype unit: str
+    :ivar dimensions: Dimensions of blobs, including blob type and access tier.
+    :vartype dimensions: list[~azure.mgmt.storage.v2024_01_01.models.Dimension]
+    :ivar aggregation_type: Aggregation type could be Average.
+    :vartype aggregation_type: str
+    :ivar fill_gap_with_zero: The property to decide fill gap with zero or not.
+    :vartype fill_gap_with_zero: bool
+    :ivar category: The category this metric specification belong to, could be Capacity.
+    :vartype category: str
+    :ivar resource_id_dimension_name_override: Account Resource Id.
+    :vartype resource_id_dimension_name_override: str
+    """
+
+    _attribute_map = {
+        "name": {"key": "name", "type": "str"},
+        "display_name": {"key": "displayName", "type": "str"},
+        "display_description": {"key": "displayDescription", "type": "str"},
+        "unit": {"key": "unit", "type": "str"},
+        "dimensions": {"key": "dimensions", "type": "[Dimension]"},
+        "aggregation_type": {"key": "aggregationType", "type": "str"},
+        "fill_gap_with_zero": {"key": "fillGapWithZero", "type": "bool"},
+        "category": {"key": "category", "type": "str"},
+        "resource_id_dimension_name_override": {"key": "resourceIdDimensionNameOverride", "type": "str"},
+    }
+
+    def __init__(
+        self,
+        *,
+        name: Optional[str] = None,
+        display_name: Optional[str] = None,
+        display_description: Optional[str] = None,
+        unit: Optional[str] = None,
+        dimensions: Optional[List["_models.Dimension"]] = None,
+        aggregation_type: Optional[str] = None,
+        fill_gap_with_zero: Optional[bool] = None,
+        category: Optional[str] = None,
+        resource_id_dimension_name_override: Optional[str] = None,
+        **kwargs: Any
+    ) -> None:
+        """
+        :keyword name: Name of metric specification.
+        :paramtype name: str
+        :keyword display_name: Display name of metric specification.
+        :paramtype display_name: str
+        :keyword display_description: Display description of metric specification.
+        :paramtype display_description: str
+        :keyword unit: Unit could be Bytes or Count.
+        :paramtype unit: str
+        :keyword dimensions: Dimensions of blobs, including blob type and access tier.
+        :paramtype dimensions: list[~azure.mgmt.storage.v2024_01_01.models.Dimension]
+        :keyword aggregation_type: Aggregation type could be Average.
+        :paramtype aggregation_type: str
+        :keyword fill_gap_with_zero: The property to decide fill gap with zero or not.
+        :paramtype fill_gap_with_zero: bool
+        :keyword category: The category this metric specification belong to, could be Capacity.
+        :paramtype category: str
+        :keyword resource_id_dimension_name_override: Account Resource Id.
+        :paramtype resource_id_dimension_name_override: str
+        """
+        super().__init__(**kwargs)
+        self.name = name
+        self.display_name = display_name
+        self.display_description = display_description
+        self.unit = unit
+        self.dimensions = dimensions
+        self.aggregation_type = aggregation_type
+        self.fill_gap_with_zero = fill_gap_with_zero
+        self.category = category
+        self.resource_id_dimension_name_override = resource_id_dimension_name_override
+
+
+class Multichannel(_serialization.Model):
+    """Multichannel setting. Applies to Premium FileStorage only.
+
+    :ivar enabled: Indicates whether multichannel is enabled.
+    :vartype enabled: bool
+    """
+
+    _attribute_map = {
+        "enabled": {"key": "enabled", "type": "bool"},
+    }
+
+    def __init__(self, *, enabled: Optional[bool] = None, **kwargs: Any) -> None:
+        """
+        :keyword enabled: Indicates whether multichannel is enabled.
+        :paramtype enabled: bool
+        """
+        super().__init__(**kwargs)
+        self.enabled = enabled
+
+
+class NetworkRuleSet(_serialization.Model):
+    """Network rule set.
+
+    All required parameters must be populated in order to send to server.
+
+    :ivar bypass: Specifies whether traffic is bypassed for Logging/Metrics/AzureServices. Possible
+     values are any combination of Logging|Metrics|AzureServices (For example, "Logging, Metrics"),
+     or None to bypass none of those traffics. Known values are: "None", "Logging", "Metrics", and
+     "AzureServices".
+    :vartype bypass: str or ~azure.mgmt.storage.v2024_01_01.models.Bypass
+    :ivar resource_access_rules: Sets the resource access rules.
+    :vartype resource_access_rules: list[~azure.mgmt.storage.v2024_01_01.models.ResourceAccessRule]
+    :ivar virtual_network_rules: Sets the virtual network rules.
+    :vartype virtual_network_rules: list[~azure.mgmt.storage.v2024_01_01.models.VirtualNetworkRule]
+    :ivar ip_rules: Sets the IP ACL rules.
+    :vartype ip_rules: list[~azure.mgmt.storage.v2024_01_01.models.IPRule]
+    :ivar default_action: Specifies the default action of allow or deny when no other rules match.
+     Known values are: "Allow" and "Deny".
+    :vartype default_action: str or ~azure.mgmt.storage.v2024_01_01.models.DefaultAction
+    """
+
+    _validation = {
+        "default_action": {"required": True},
+    }
+
+    _attribute_map = {
+        "bypass": {"key": "bypass", "type": "str"},
+        "resource_access_rules": {"key": "resourceAccessRules", "type": "[ResourceAccessRule]"},
+        "virtual_network_rules": {"key": "virtualNetworkRules", "type": "[VirtualNetworkRule]"},
+        "ip_rules": {"key": "ipRules", "type": "[IPRule]"},
+        "default_action": {"key": "defaultAction", "type": "str"},
+    }
+
+    def __init__(
+        self,
+        *,
+        default_action: Union[str, "_models.DefaultAction"] = "Allow",
+        bypass: Union[str, "_models.Bypass"] = "AzureServices",
+        resource_access_rules: Optional[List["_models.ResourceAccessRule"]] = None,
+        virtual_network_rules: Optional[List["_models.VirtualNetworkRule"]] = None,
+        ip_rules: Optional[List["_models.IPRule"]] = None,
+        **kwargs: Any
+    ) -> None:
+        """
+        :keyword bypass: Specifies whether traffic is bypassed for Logging/Metrics/AzureServices.
+         Possible values are any combination of Logging|Metrics|AzureServices (For example, "Logging,
+         Metrics"), or None to bypass none of those traffics. Known values are: "None", "Logging",
+         "Metrics", and "AzureServices".
+        :paramtype bypass: str or ~azure.mgmt.storage.v2024_01_01.models.Bypass
+        :keyword resource_access_rules: Sets the resource access rules.
+        :paramtype resource_access_rules:
+         list[~azure.mgmt.storage.v2024_01_01.models.ResourceAccessRule]
+        :keyword virtual_network_rules: Sets the virtual network rules.
+        :paramtype virtual_network_rules:
+         list[~azure.mgmt.storage.v2024_01_01.models.VirtualNetworkRule]
+        :keyword ip_rules: Sets the IP ACL rules.
+        :paramtype ip_rules: list[~azure.mgmt.storage.v2024_01_01.models.IPRule]
+        :keyword default_action: Specifies the default action of allow or deny when no other rules
+         match. Known values are: "Allow" and "Deny".
+        :paramtype default_action: str or ~azure.mgmt.storage.v2024_01_01.models.DefaultAction
+        """
+        super().__init__(**kwargs)
+        self.bypass = bypass
+        self.resource_access_rules = resource_access_rules
+        self.virtual_network_rules = virtual_network_rules
+        self.ip_rules = ip_rules
+        self.default_action = default_action
+
+
+class NetworkSecurityPerimeter(_serialization.Model):
+    """NetworkSecurityPerimeter related information.
+
+    :ivar id: The ARM identifier of the resource.
+    :vartype id: str
+    :ivar perimeter_guid: Guid of the resource.
+    :vartype perimeter_guid: str
+    :ivar location: Location of the resource.
+    :vartype location: str
+    """
+
+    _attribute_map = {
+        "id": {"key": "id", "type": "str"},
+        "perimeter_guid": {"key": "perimeterGuid", "type": "str"},
+        "location": {"key": "location", "type": "str"},
+    }
+
+    def __init__(
+        self,
+        *,
+        id: Optional[str] = None,  # pylint: disable=redefined-builtin
+        perimeter_guid: Optional[str] = None,
+        location: Optional[str] = None,
+        **kwargs: Any
+    ) -> None:
+        """
+        :keyword id: The ARM identifier of the resource.
+        :paramtype id: str
+        :keyword perimeter_guid: Guid of the resource.
+        :paramtype perimeter_guid: str
+        :keyword location: Location of the resource.
+        :paramtype location: str
+        """
+        super().__init__(**kwargs)
+        self.id = id
+        self.perimeter_guid = perimeter_guid
+        self.location = location
+
+
+class ResourceAutoGenerated(_serialization.Model):
+    """Common fields that are returned in the response for all Azure Resource Manager resources.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar id: Fully qualified resource ID for the resource. E.g.
+     "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}".  # pylint: disable=line-too-long
+    :vartype id: str
+    :ivar name: The name of the resource.
+    :vartype name: str
+    :ivar type: The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or
+     "Microsoft.Storage/storageAccounts".
+    :vartype type: str
+    :ivar system_data: Azure Resource Manager metadata containing createdBy and modifiedBy
+     information.
+    :vartype system_data: ~azure.mgmt.storage.v2024_01_01.models.SystemData
+    """
+
+    _validation = {
+        "id": {"readonly": True},
+        "name": {"readonly": True},
+        "type": {"readonly": True},
+        "system_data": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "id": {"key": "id", "type": "str"},
+        "name": {"key": "name", "type": "str"},
+        "type": {"key": "type", "type": "str"},
+        "system_data": {"key": "systemData", "type": "SystemData"},
+    }
+
+    def __init__(self, **kwargs: Any) -> None:
+        """ """
+        super().__init__(**kwargs)
+        self.id = None
+        self.name = None
+        self.type = None
+        self.system_data = None
+
+
+class ProxyResourceAutoGenerated(ResourceAutoGenerated):
+    """The resource model definition for a Azure Resource Manager proxy resource. It will not have
+    tags and a location.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar id: Fully qualified resource ID for the resource. E.g.
+     "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}".  # pylint: disable=line-too-long
+    :vartype id: str
+    :ivar name: The name of the resource.
+    :vartype name: str
+    :ivar type: The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or
+     "Microsoft.Storage/storageAccounts".
+    :vartype type: str
+    :ivar system_data: Azure Resource Manager metadata containing createdBy and modifiedBy
+     information.
+    :vartype system_data: ~azure.mgmt.storage.v2024_01_01.models.SystemData
+    """
+
+
+class NetworkSecurityPerimeterConfiguration(ProxyResourceAutoGenerated):
+    """The Network Security Perimeter configuration resource.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar id: Fully qualified resource ID for the resource. E.g.
+     "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}".  # pylint: disable=line-too-long
+    :vartype id: str
+    :ivar name: The name of the resource.
+    :vartype name: str
+    :ivar type: The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or
+     "Microsoft.Storage/storageAccounts".
+    :vartype type: str
+    :ivar system_data: Azure Resource Manager metadata containing createdBy and modifiedBy
+     information.
+    :vartype system_data: ~azure.mgmt.storage.v2024_01_01.models.SystemData
+    :ivar provisioning_state: Provisioning state of Network Security Perimeter configuration
+     propagation. Known values are: "Accepted", "Succeeded", "Failed", "Deleting", and "Canceled".
+    :vartype provisioning_state: str or
+     ~azure.mgmt.storage.v2024_01_01.models.NetworkSecurityPerimeterConfigurationProvisioningState
+    :ivar provisioning_issues: List of Provisioning Issues if any.
+    :vartype provisioning_issues: list[~azure.mgmt.storage.v2024_01_01.models.ProvisioningIssue]
+    :ivar network_security_perimeter: NetworkSecurityPerimeter related information.
+    :vartype network_security_perimeter:
+     ~azure.mgmt.storage.v2024_01_01.models.NetworkSecurityPerimeter
+    :ivar resource_association: Information about resource association.
+    :vartype resource_association:
+     ~azure.mgmt.storage.v2024_01_01.models.NetworkSecurityPerimeterConfigurationPropertiesResourceAssociation
+    :ivar profile: Network Security Perimeter profile.
+    :vartype profile:
+     ~azure.mgmt.storage.v2024_01_01.models.NetworkSecurityPerimeterConfigurationPropertiesProfile
+    """
+
+    _validation = {
+        "id": {"readonly": True},
+        "name": {"readonly": True},
+        "type": {"readonly": True},
+        "system_data": {"readonly": True},
+        "provisioning_state": {"readonly": True},
+        "provisioning_issues": {"readonly": True},
+        "network_security_perimeter": {"readonly": True},
+        "resource_association": {"readonly": True},
+        "profile": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "id": {"key": "id", "type": "str"},
+        "name": {"key": "name", "type": "str"},
+        "type": {"key": "type", "type": "str"},
+        "system_data": {"key": "systemData", "type": "SystemData"},
+        "provisioning_state": {"key": "properties.provisioningState", "type": "str"},
+        "provisioning_issues": {"key": "properties.provisioningIssues", "type": "[ProvisioningIssue]"},
+        "network_security_perimeter": {
+            "key": "properties.networkSecurityPerimeter",
+            "type": "NetworkSecurityPerimeter",
+        },
+        "resource_association": {
+            "key": "properties.resourceAssociation",
+            "type": "NetworkSecurityPerimeterConfigurationPropertiesResourceAssociation",
+        },
+        "profile": {"key": "properties.profile", "type": "NetworkSecurityPerimeterConfigurationPropertiesProfile"},
+    }
+
+    def __init__(self, **kwargs: Any) -> None:
+        """ """
+        super().__init__(**kwargs)
+        self.provisioning_state = None
+        self.provisioning_issues = None
+        self.network_security_perimeter = None
+        self.resource_association = None
+        self.profile = None
+
+
+class NetworkSecurityPerimeterConfigurationList(_serialization.Model):  # pylint: disable=name-too-long
+    """Result of the List Network Security Perimeter configuration operation.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar value: A collection of Network Security Perimeter configurations.
+    :vartype value:
+     list[~azure.mgmt.storage.v2024_01_01.models.NetworkSecurityPerimeterConfiguration]
+    :ivar next_link: The URI that can be used to request the next set of paged results.
+    :vartype next_link: str
+    """
+
+    _validation = {
+        "value": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "value": {"key": "value", "type": "[NetworkSecurityPerimeterConfiguration]"},
+        "next_link": {"key": "nextLink", "type": "str"},
+    }
+
+    def __init__(self, *, next_link: Optional[str] = None, **kwargs: Any) -> None:
+        """
+        :keyword next_link: The URI that can be used to request the next set of paged results.
+        :paramtype next_link: str
+        """
+        super().__init__(**kwargs)
+        self.value = None
+        self.next_link = next_link
+
+
+class NetworkSecurityPerimeterConfigurationPropertiesProfile(_serialization.Model):  # pylint: disable=name-too-long
+    """Network Security Perimeter profile.
+
+    :ivar name: Name of the resource.
+    :vartype name: str
+    :ivar access_rules_version: Current access rules version.
+    :vartype access_rules_version: float
+    :ivar access_rules: List of Access Rules.
+    :vartype access_rules: list[~azure.mgmt.storage.v2024_01_01.models.NspAccessRule]
+    :ivar diagnostic_settings_version: Diagnostic settings version.
+    :vartype diagnostic_settings_version: float
+    :ivar enabled_log_categories: Enabled logging categories.
+    :vartype enabled_log_categories: list[str]
+    """
+
+    _attribute_map = {
+        "name": {"key": "name", "type": "str"},
+        "access_rules_version": {"key": "accessRulesVersion", "type": "float"},
+        "access_rules": {"key": "accessRules", "type": "[NspAccessRule]"},
+        "diagnostic_settings_version": {"key": "diagnosticSettingsVersion", "type": "float"},
+        "enabled_log_categories": {"key": "enabledLogCategories", "type": "[str]"},
+    }
+
+    def __init__(
+        self,
+        *,
+        name: Optional[str] = None,
+        access_rules_version: Optional[float] = None,
+        access_rules: Optional[List["_models.NspAccessRule"]] = None,
+        diagnostic_settings_version: Optional[float] = None,
+        enabled_log_categories: Optional[List[str]] = None,
+        **kwargs: Any
+    ) -> None:
+        """
+        :keyword name: Name of the resource.
+        :paramtype name: str
+        :keyword access_rules_version: Current access rules version.
+        :paramtype access_rules_version: float
+        :keyword access_rules: List of Access Rules.
+        :paramtype access_rules: list[~azure.mgmt.storage.v2024_01_01.models.NspAccessRule]
+        :keyword diagnostic_settings_version: Diagnostic settings version.
+        :paramtype diagnostic_settings_version: float
+        :keyword enabled_log_categories: Enabled logging categories.
+        :paramtype enabled_log_categories: list[str]
+        """
+        super().__init__(**kwargs)
+        self.name = name
+        self.access_rules_version = access_rules_version
+        self.access_rules = access_rules
+        self.diagnostic_settings_version = diagnostic_settings_version
+        self.enabled_log_categories = enabled_log_categories
+
+
+class NetworkSecurityPerimeterConfigurationPropertiesResourceAssociation(
+    _serialization.Model
+):  # pylint: disable=name-too-long
+    """Information about resource association.
+
+    :ivar name: Name of the resource association.
+    :vartype name: str
+    :ivar access_mode: Access Mode of the resource association. Known values are: "Enforced",
+     "Learning", and "Audit".
+    :vartype access_mode: str or
+     ~azure.mgmt.storage.v2024_01_01.models.ResourceAssociationAccessMode
+    """
+
+    _attribute_map = {
+        "name": {"key": "name", "type": "str"},
+        "access_mode": {"key": "accessMode", "type": "str"},
+    }
+
+    def __init__(
+        self,
+        *,
+        name: Optional[str] = None,
+        access_mode: Optional[Union[str, "_models.ResourceAssociationAccessMode"]] = None,
+        **kwargs: Any
+    ) -> None:
+        """
+        :keyword name: Name of the resource association.
+        :paramtype name: str
+        :keyword access_mode: Access Mode of the resource association. Known values are: "Enforced",
+         "Learning", and "Audit".
+        :paramtype access_mode: str or
+         ~azure.mgmt.storage.v2024_01_01.models.ResourceAssociationAccessMode
+        """
+        super().__init__(**kwargs)
+        self.name = name
+        self.access_mode = access_mode
+
+
+class NspAccessRule(_serialization.Model):
+    """Information of Access Rule in Network Security Perimeter profile.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar name: Name of the resource.
+    :vartype name: str
+    :ivar properties: Properties of Access Rule.
+    :vartype properties: ~azure.mgmt.storage.v2024_01_01.models.NspAccessRuleProperties
+    """
+
+    _validation = {
+        "properties": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "name": {"key": "name", "type": "str"},
+        "properties": {"key": "properties", "type": "NspAccessRuleProperties"},
+    }
+
+    def __init__(self, *, name: Optional[str] = None, **kwargs: Any) -> None:
+        """
+        :keyword name: Name of the resource.
+        :paramtype name: str
+        """
+        super().__init__(**kwargs)
+        self.name = name
+        self.properties = None
+
+
+class NspAccessRuleProperties(_serialization.Model):
+    """Properties of Access Rule.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar direction: Direction of Access Rule. Known values are: "Inbound" and "Outbound".
+    :vartype direction: str or ~azure.mgmt.storage.v2024_01_01.models.NspAccessRuleDirection
+    :ivar address_prefixes: Address prefixes in the CIDR format for inbound rules.
+    :vartype address_prefixes: list[str]
+    :ivar subscriptions: Subscriptions for inbound rules.
+    :vartype subscriptions:
+     list[~azure.mgmt.storage.v2024_01_01.models.NspAccessRulePropertiesSubscriptionsItem]
+    :ivar network_security_perimeters: NetworkSecurityPerimeters for inbound rules.
+    :vartype network_security_perimeters:
+     list[~azure.mgmt.storage.v2024_01_01.models.NetworkSecurityPerimeter]
+    :ivar fully_qualified_domain_names: FQDN for outbound rules.
+    :vartype fully_qualified_domain_names: list[str]
+    """
+
+    _validation = {
+        "network_security_perimeters": {"readonly": True},
+        "fully_qualified_domain_names": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "direction": {"key": "direction", "type": "str"},
+        "address_prefixes": {"key": "addressPrefixes", "type": "[str]"},
+        "subscriptions": {"key": "subscriptions", "type": "[NspAccessRulePropertiesSubscriptionsItem]"},
+        "network_security_perimeters": {"key": "networkSecurityPerimeters", "type": "[NetworkSecurityPerimeter]"},
+        "fully_qualified_domain_names": {"key": "fullyQualifiedDomainNames", "type": "[str]"},
+    }
+
+    def __init__(
+        self,
+        *,
+        direction: Optional[Union[str, "_models.NspAccessRuleDirection"]] = None,
+        address_prefixes: Optional[List[str]] = None,
+        subscriptions: Optional[List["_models.NspAccessRulePropertiesSubscriptionsItem"]] = None,
+        **kwargs: Any
+    ) -> None:
+        """
+        :keyword direction: Direction of Access Rule. Known values are: "Inbound" and "Outbound".
+        :paramtype direction: str or ~azure.mgmt.storage.v2024_01_01.models.NspAccessRuleDirection
+        :keyword address_prefixes: Address prefixes in the CIDR format for inbound rules.
+        :paramtype address_prefixes: list[str]
+        :keyword subscriptions: Subscriptions for inbound rules.
+        :paramtype subscriptions:
+         list[~azure.mgmt.storage.v2024_01_01.models.NspAccessRulePropertiesSubscriptionsItem]
+        """
+        super().__init__(**kwargs)
+        self.direction = direction
+        self.address_prefixes = address_prefixes
+        self.subscriptions = subscriptions
+        self.network_security_perimeters = None
+        self.fully_qualified_domain_names = None
+
+
+class NspAccessRulePropertiesSubscriptionsItem(_serialization.Model):
+    """Subscription for inbound rule.
+
+    :ivar id: The ARM identifier of subscription.
+    :vartype id: str
+    """
+
+    _attribute_map = {
+        "id": {"key": "id", "type": "str"},
+    }
+
+    def __init__(self, *, id: Optional[str] = None, **kwargs: Any) -> None:  # pylint: disable=redefined-builtin
+        """
+        :keyword id: The ARM identifier of subscription.
+        :paramtype id: str
+        """
+        super().__init__(**kwargs)
+        self.id = id
+
+
+class ObjectReplicationPolicies(_serialization.Model):
+    """List storage account object replication policies.
+
+    :ivar value: The replication policy between two storage accounts.
+    :vartype value: list[~azure.mgmt.storage.v2024_01_01.models.ObjectReplicationPolicy]
+    """
+
+    _attribute_map = {
+        "value": {"key": "value", "type": "[ObjectReplicationPolicy]"},
+    }
+
+    def __init__(self, *, value: Optional[List["_models.ObjectReplicationPolicy"]] = None, **kwargs: Any) -> None:
+        """
+        :keyword value: The replication policy between two storage accounts.
+        :paramtype value: list[~azure.mgmt.storage.v2024_01_01.models.ObjectReplicationPolicy]
+        """
+        super().__init__(**kwargs)
+        self.value = value
+
+
+class ObjectReplicationPolicy(Resource):
+    """The replication policy between two storage accounts. Multiple rules can be defined in one
+    policy.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar id: Fully qualified resource ID for the resource. Ex -
+     /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}.  # pylint: disable=line-too-long
+    :vartype id: str
+    :ivar name: The name of the resource.
+    :vartype name: str
+    :ivar type: The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or
+     "Microsoft.Storage/storageAccounts".
+    :vartype type: str
+    :ivar policy_id: A unique id for object replication policy.
+    :vartype policy_id: str
+    :ivar enabled_time: Indicates when the policy is enabled on the source account.
+    :vartype enabled_time: ~datetime.datetime
+    :ivar source_account: Required. Source account name. It should be full resource id if
+     allowCrossTenantReplication set to false.
+    :vartype source_account: str
+    :ivar destination_account: Required. Destination account name. It should be full resource id if
+     allowCrossTenantReplication set to false.
+    :vartype destination_account: str
+    :ivar rules: The storage account object replication rules.
+    :vartype rules: list[~azure.mgmt.storage.v2024_01_01.models.ObjectReplicationPolicyRule]
+    :ivar metrics: Optional. The object replication policy metrics feature options.
+    :vartype metrics:
+     ~azure.mgmt.storage.v2024_01_01.models.ObjectReplicationPolicyPropertiesMetrics
+    """
+
+    _validation = {
+        "id": {"readonly": True},
+        "name": {"readonly": True},
+        "type": {"readonly": True},
+        "policy_id": {"readonly": True},
+        "enabled_time": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "id": {"key": "id", "type": "str"},
+        "name": {"key": "name", "type": "str"},
+        "type": {"key": "type", "type": "str"},
+        "policy_id": {"key": "properties.policyId", "type": "str"},
+        "enabled_time": {"key": "properties.enabledTime", "type": "iso-8601"},
+        "source_account": {"key": "properties.sourceAccount", "type": "str"},
+        "destination_account": {"key": "properties.destinationAccount", "type": "str"},
+        "rules": {"key": "properties.rules", "type": "[ObjectReplicationPolicyRule]"},
+        "metrics": {"key": "properties.metrics", "type": "ObjectReplicationPolicyPropertiesMetrics"},
+    }
+
+    def __init__(
+        self,
+        *,
+        source_account: Optional[str] = None,
+        destination_account: Optional[str] = None,
+        rules: Optional[List["_models.ObjectReplicationPolicyRule"]] = None,
+        metrics: Optional["_models.ObjectReplicationPolicyPropertiesMetrics"] = None,
+        **kwargs: Any
+    ) -> None:
+        """
+        :keyword source_account: Required. Source account name. It should be full resource id if
+         allowCrossTenantReplication set to false.
+        :paramtype source_account: str
+        :keyword destination_account: Required. Destination account name. It should be full resource id
+         if allowCrossTenantReplication set to false.
+        :paramtype destination_account: str
+        :keyword rules: The storage account object replication rules.
+        :paramtype rules: list[~azure.mgmt.storage.v2024_01_01.models.ObjectReplicationPolicyRule]
+        :keyword metrics: Optional. The object replication policy metrics feature options.
+        :paramtype metrics:
+         ~azure.mgmt.storage.v2024_01_01.models.ObjectReplicationPolicyPropertiesMetrics
+        """
+        super().__init__(**kwargs)
+        self.policy_id = None
+        self.enabled_time = None
+        self.source_account = source_account
+        self.destination_account = destination_account
+        self.rules = rules
+        self.metrics = metrics
+
+
+class ObjectReplicationPolicyFilter(_serialization.Model):
+    """Filters limit replication to a subset of blobs within the storage account. A logical OR is
+    performed on values in the filter. If multiple filters are defined, a logical AND is performed
+    on all filters.
+
+    :ivar prefix_match: Optional. Filters the results to replicate only blobs whose names begin
+     with the specified prefix.
+    :vartype prefix_match: list[str]
+    :ivar min_creation_time: Blobs created after the time will be replicated to the destination. It
+     must be in datetime format 'yyyy-MM-ddTHH:mm:ssZ'. Example: 2020-02-19T16:05:00Z.
+    :vartype min_creation_time: str
+    """
+
+    _attribute_map = {
+        "prefix_match": {"key": "prefixMatch", "type": "[str]"},
+        "min_creation_time": {"key": "minCreationTime", "type": "str"},
+    }
+
+    def __init__(
+        self, *, prefix_match: Optional[List[str]] = None, min_creation_time: Optional[str] = None, **kwargs: Any
+    ) -> None:
+        """
+        :keyword prefix_match: Optional. Filters the results to replicate only blobs whose names begin
+         with the specified prefix.
+        :paramtype prefix_match: list[str]
+        :keyword min_creation_time: Blobs created after the time will be replicated to the destination.
+         It must be in datetime format 'yyyy-MM-ddTHH:mm:ssZ'. Example: 2020-02-19T16:05:00Z.
+        :paramtype min_creation_time: str
+        """
+        super().__init__(**kwargs)
+        self.prefix_match = prefix_match
+        self.min_creation_time = min_creation_time
+
+
+class ObjectReplicationPolicyPropertiesMetrics(_serialization.Model):
+    """Optional. The object replication policy metrics feature options.
+
+    :ivar enabled: Indicates whether object replication metrics feature is enabled for the policy.
+    :vartype enabled: bool
+    """
+
+    _attribute_map = {
+        "enabled": {"key": "enabled", "type": "bool"},
+    }
+
+    def __init__(self, *, enabled: Optional[bool] = None, **kwargs: Any) -> None:
+        """
+        :keyword enabled: Indicates whether object replication metrics feature is enabled for the
+         policy.
+        :paramtype enabled: bool
+        """
+        super().__init__(**kwargs)
+        self.enabled = enabled
+
+
+class ObjectReplicationPolicyRule(_serialization.Model):
+    """The replication policy rule between two containers.
+
+    All required parameters must be populated in order to send to server.
+
+    :ivar rule_id: Rule Id is auto-generated for each new rule on destination account. It is
+     required for put policy on source account.
+    :vartype rule_id: str
+    :ivar source_container: Required. Source container name. Required.
+    :vartype source_container: str
+    :ivar destination_container: Required. Destination container name. Required.
+    :vartype destination_container: str
+    :ivar filters: Optional. An object that defines the filter set.
+    :vartype filters: ~azure.mgmt.storage.v2024_01_01.models.ObjectReplicationPolicyFilter
+    """
+
+    _validation = {
+        "source_container": {"required": True},
+        "destination_container": {"required": True},
+    }
+
+    _attribute_map = {
+        "rule_id": {"key": "ruleId", "type": "str"},
+        "source_container": {"key": "sourceContainer", "type": "str"},
+        "destination_container": {"key": "destinationContainer", "type": "str"},
+        "filters": {"key": "filters", "type": "ObjectReplicationPolicyFilter"},
+    }
+
+    def __init__(
+        self,
+        *,
+        source_container: str,
+        destination_container: str,
+        rule_id: Optional[str] = None,
+        filters: Optional["_models.ObjectReplicationPolicyFilter"] = None,
+        **kwargs: Any
+    ) -> None:
+        """
+        :keyword rule_id: Rule Id is auto-generated for each new rule on destination account. It is
+         required for put policy on source account.
+        :paramtype rule_id: str
+        :keyword source_container: Required. Source container name. Required.
+        :paramtype source_container: str
+        :keyword destination_container: Required. Destination container name. Required.
+        :paramtype destination_container: str
+        :keyword filters: Optional. An object that defines the filter set.
+        :paramtype filters: ~azure.mgmt.storage.v2024_01_01.models.ObjectReplicationPolicyFilter
+        """
+        super().__init__(**kwargs)
+        self.rule_id = rule_id
+        self.source_container = source_container
+        self.destination_container = destination_container
+        self.filters = filters
+
+
+class Operation(_serialization.Model):
+    """Storage REST API operation definition.
+
+    :ivar name: Operation name: {provider}/{resource}/{operation}.
+    :vartype name: str
+    :ivar display: Display metadata associated with the operation.
+    :vartype display: ~azure.mgmt.storage.v2024_01_01.models.OperationDisplay
+    :ivar origin: The origin of operations.
+    :vartype origin: str
+    :ivar service_specification: One property of operation, include metric specifications.
+    :vartype service_specification: ~azure.mgmt.storage.v2024_01_01.models.ServiceSpecification
+    """
+
+    _attribute_map = {
+        "name": {"key": "name", "type": "str"},
+        "display": {"key": "display", "type": "OperationDisplay"},
+        "origin": {"key": "origin", "type": "str"},
+        "service_specification": {"key": "properties.serviceSpecification", "type": "ServiceSpecification"},
+    }
+
+    def __init__(
+        self,
+        *,
+        name: Optional[str] = None,
+        display: Optional["_models.OperationDisplay"] = None,
+        origin: Optional[str] = None,
+        service_specification: Optional["_models.ServiceSpecification"] = None,
+        **kwargs: Any
+    ) -> None:
+        """
+        :keyword name: Operation name: {provider}/{resource}/{operation}.
+        :paramtype name: str
+        :keyword display: Display metadata associated with the operation.
+        :paramtype display: ~azure.mgmt.storage.v2024_01_01.models.OperationDisplay
+        :keyword origin: The origin of operations.
+        :paramtype origin: str
+        :keyword service_specification: One property of operation, include metric specifications.
+        :paramtype service_specification: ~azure.mgmt.storage.v2024_01_01.models.ServiceSpecification
+        """
+        super().__init__(**kwargs)
+        self.name = name
+        self.display = display
+        self.origin = origin
+        self.service_specification = service_specification
+
+
+class OperationDisplay(_serialization.Model):
+    """Display metadata associated with the operation.
+
+    :ivar provider: Service provider: Microsoft Storage.
+    :vartype provider: str
+    :ivar resource: Resource on which the operation is performed etc.
+    :vartype resource: str
+    :ivar operation: Type of operation: get, read, delete, etc.
+    :vartype operation: str
+    :ivar description: Description of the operation.
+    :vartype description: str
+    """
+
+    _attribute_map = {
+        "provider": {"key": "provider", "type": "str"},
+        "resource": {"key": "resource", "type": "str"},
+        "operation": {"key": "operation", "type": "str"},
+        "description": {"key": "description", "type": "str"},
+    }
+
+    def __init__(
+        self,
+        *,
+        provider: Optional[str] = None,
+        resource: Optional[str] = None,
+        operation: Optional[str] = None,
+        description: Optional[str] = None,
+        **kwargs: Any
+    ) -> None:
+        """
+        :keyword provider: Service provider: Microsoft Storage.
+        :paramtype provider: str
+        :keyword resource: Resource on which the operation is performed etc.
+        :paramtype resource: str
+        :keyword operation: Type of operation: get, read, delete, etc.
+        :paramtype operation: str
+        :keyword description: Description of the operation.
+        :paramtype description: str
+        """
+        super().__init__(**kwargs)
+        self.provider = provider
+        self.resource = resource
+        self.operation = operation
+        self.description = description
+
+
+class OperationListResult(_serialization.Model):
+    """Result of the request to list Storage operations. It contains a list of operations and a URL
+    link to get the next set of results.
+
+    :ivar value: List of Storage operations supported by the Storage resource provider.
+    :vartype value: list[~azure.mgmt.storage.v2024_01_01.models.Operation]
+    """
+
+    _attribute_map = {
+        "value": {"key": "value", "type": "[Operation]"},
+    }
+
+    def __init__(self, *, value: Optional[List["_models.Operation"]] = None, **kwargs: Any) -> None:
+        """
+        :keyword value: List of Storage operations supported by the Storage resource provider.
+        :paramtype value: list[~azure.mgmt.storage.v2024_01_01.models.Operation]
+        """
+        super().__init__(**kwargs)
+        self.value = value
+
+
+class PermissionScope(_serialization.Model):
+    """PermissionScope.
+
+    All required parameters must be populated in order to send to server.
+
+    :ivar permissions: The permissions for the local user. Possible values include: Read (r), Write
+     (w), Delete (d), List (l), Create (c), Modify Ownership (o), and Modify Permissions (p).
+     Required.
+    :vartype permissions: str
+    :ivar service: The service used by the local user, e.g. blob, file. Required.
+    :vartype service: str
+    :ivar resource_name: The name of resource, normally the container name or the file share name,
+     used by the local user. Required.
+    :vartype resource_name: str
+    """
+
+    _validation = {
+        "permissions": {"required": True},
+        "service": {"required": True},
+        "resource_name": {"required": True},
+    }
+
+    _attribute_map = {
+        "permissions": {"key": "permissions", "type": "str"},
+        "service": {"key": "service", "type": "str"},
+        "resource_name": {"key": "resourceName", "type": "str"},
+    }
+
+    def __init__(self, *, permissions: str, service: str, resource_name: str, **kwargs: Any) -> None:
+        """
+        :keyword permissions: The permissions for the local user. Possible values include: Read (r),
+         Write (w), Delete (d), List (l), Create (c), Modify Ownership (o), and Modify Permissions (p).
+         Required.
+        :paramtype permissions: str
+        :keyword service: The service used by the local user, e.g. blob, file. Required.
+        :paramtype service: str
+        :keyword resource_name: The name of resource, normally the container name or the file share
+         name, used by the local user. Required.
+        :paramtype resource_name: str
+        """
+        super().__init__(**kwargs)
+        self.permissions = permissions
+        self.service = service
+        self.resource_name = resource_name
+
+
+class PrivateEndpoint(_serialization.Model):
+    """The Private Endpoint resource.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar id: The ARM identifier for Private Endpoint.
+    :vartype id: str
+    """
+
+    _validation = {
+        "id": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "id": {"key": "id", "type": "str"},
+    }
+
+    def __init__(self, **kwargs: Any) -> None:
+        """ """
+        super().__init__(**kwargs)
+        self.id = None
+
+
+class PrivateEndpointConnection(Resource):
+    """The Private Endpoint Connection resource.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar id: Fully qualified resource ID for the resource. Ex -
+     /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}.  # pylint: disable=line-too-long
+    :vartype id: str
+    :ivar name: The name of the resource.
+    :vartype name: str
+    :ivar type: The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or
+     "Microsoft.Storage/storageAccounts".
+    :vartype type: str
+    :ivar private_endpoint: The resource of private end point.
+    :vartype private_endpoint: ~azure.mgmt.storage.v2024_01_01.models.PrivateEndpoint
+    :ivar private_link_service_connection_state: A collection of information about the state of the
+     connection between service consumer and provider.
+    :vartype private_link_service_connection_state:
+     ~azure.mgmt.storage.v2024_01_01.models.PrivateLinkServiceConnectionState
+    :ivar provisioning_state: The provisioning state of the private endpoint connection resource.
+     Known values are: "Succeeded", "Creating", "Deleting", and "Failed".
+    :vartype provisioning_state: str or
+     ~azure.mgmt.storage.v2024_01_01.models.PrivateEndpointConnectionProvisioningState
+    """
+
+    _validation = {
+        "id": {"readonly": True},
+        "name": {"readonly": True},
+        "type": {"readonly": True},
+        "provisioning_state": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "id": {"key": "id", "type": "str"},
+        "name": {"key": "name", "type": "str"},
+        "type": {"key": "type", "type": "str"},
+        "private_endpoint": {"key": "properties.privateEndpoint", "type": "PrivateEndpoint"},
+        "private_link_service_connection_state": {
+            "key": "properties.privateLinkServiceConnectionState",
+            "type": "PrivateLinkServiceConnectionState",
+        },
+        "provisioning_state": {"key": "properties.provisioningState", "type": "str"},
+    }
+
+    def __init__(
+        self,
+        *,
+        private_endpoint: Optional["_models.PrivateEndpoint"] = None,
+        private_link_service_connection_state: Optional["_models.PrivateLinkServiceConnectionState"] = None,
+        **kwargs: Any
+    ) -> None:
+        """
+        :keyword private_endpoint: The resource of private end point.
+        :paramtype private_endpoint: ~azure.mgmt.storage.v2024_01_01.models.PrivateEndpoint
+        :keyword private_link_service_connection_state: A collection of information about the state of
+         the connection between service consumer and provider.
+        :paramtype private_link_service_connection_state:
+         ~azure.mgmt.storage.v2024_01_01.models.PrivateLinkServiceConnectionState
+        """
+        super().__init__(**kwargs)
+        self.private_endpoint = private_endpoint
+        self.private_link_service_connection_state = private_link_service_connection_state
+        self.provisioning_state = None
+
+
+class PrivateEndpointConnectionListResult(_serialization.Model):
+    """List of private endpoint connection associated with the specified storage account.
+
+    :ivar value: Array of private endpoint connections.
+    :vartype value: list[~azure.mgmt.storage.v2024_01_01.models.PrivateEndpointConnection]
+    """
+
+    _attribute_map = {
+        "value": {"key": "value", "type": "[PrivateEndpointConnection]"},
+    }
+
+    def __init__(self, *, value: Optional[List["_models.PrivateEndpointConnection"]] = None, **kwargs: Any) -> None:
+        """
+        :keyword value: Array of private endpoint connections.
+        :paramtype value: list[~azure.mgmt.storage.v2024_01_01.models.PrivateEndpointConnection]
+        """
+        super().__init__(**kwargs)
+        self.value = value
+
+
+class PrivateLinkResource(Resource):
+    """A private link resource.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar id: Fully qualified resource ID for the resource. Ex -
+     /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}.  # pylint: disable=line-too-long
+    :vartype id: str
+    :ivar name: The name of the resource.
+    :vartype name: str
+    :ivar type: The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or
+     "Microsoft.Storage/storageAccounts".
+    :vartype type: str
+    :ivar group_id: The private link resource group id.
+    :vartype group_id: str
+    :ivar required_members: The private link resource required member names.
+    :vartype required_members: list[str]
+    :ivar required_zone_names: The private link resource Private link DNS zone name.
+    :vartype required_zone_names: list[str]
+    """
+
+    _validation = {
+        "id": {"readonly": True},
+        "name": {"readonly": True},
+        "type": {"readonly": True},
+        "group_id": {"readonly": True},
+        "required_members": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "id": {"key": "id", "type": "str"},
+        "name": {"key": "name", "type": "str"},
+        "type": {"key": "type", "type": "str"},
+        "group_id": {"key": "properties.groupId", "type": "str"},
+        "required_members": {"key": "properties.requiredMembers", "type": "[str]"},
+        "required_zone_names": {"key": "properties.requiredZoneNames", "type": "[str]"},
+    }
+
+    def __init__(self, *, required_zone_names: Optional[List[str]] = None, **kwargs: Any) -> None:
+        """
+        :keyword required_zone_names: The private link resource Private link DNS zone name.
+        :paramtype required_zone_names: list[str]
+        """
+        super().__init__(**kwargs)
+        self.group_id = None
+        self.required_members = None
+        self.required_zone_names = required_zone_names
+
+
+class PrivateLinkResourceListResult(_serialization.Model):
+    """A list of private link resources.
+
+    :ivar value: Array of private link resources.
+    :vartype value: list[~azure.mgmt.storage.v2024_01_01.models.PrivateLinkResource]
+    """
+
+    _attribute_map = {
+        "value": {"key": "value", "type": "[PrivateLinkResource]"},
+    }
+
+    def __init__(self, *, value: Optional[List["_models.PrivateLinkResource"]] = None, **kwargs: Any) -> None:
+        """
+        :keyword value: Array of private link resources.
+        :paramtype value: list[~azure.mgmt.storage.v2024_01_01.models.PrivateLinkResource]
+        """
+        super().__init__(**kwargs)
+        self.value = value
+
+
+class PrivateLinkServiceConnectionState(_serialization.Model):
+    """A collection of information about the state of the connection between service consumer and
+    provider.
+
+    :ivar status: Indicates whether the connection has been Approved/Rejected/Removed by the owner
+     of the service. Known values are: "Pending", "Approved", and "Rejected".
+    :vartype status: str or
+     ~azure.mgmt.storage.v2024_01_01.models.PrivateEndpointServiceConnectionStatus
+    :ivar description: The reason for approval/rejection of the connection.
+    :vartype description: str
+    :ivar action_required: A message indicating if changes on the service provider require any
+     updates on the consumer.
+    :vartype action_required: str
+    """
+
+    _attribute_map = {
+        "status": {"key": "status", "type": "str"},
+        "description": {"key": "description", "type": "str"},
+        "action_required": {"key": "actionRequired", "type": "str"},
+    }
+
+    def __init__(
+        self,
+        *,
+        status: Optional[Union[str, "_models.PrivateEndpointServiceConnectionStatus"]] = None,
+        description: Optional[str] = None,
+        action_required: Optional[str] = None,
+        **kwargs: Any
+    ) -> None:
+        """
+        :keyword status: Indicates whether the connection has been Approved/Rejected/Removed by the
+         owner of the service. Known values are: "Pending", "Approved", and "Rejected".
+        :paramtype status: str or
+         ~azure.mgmt.storage.v2024_01_01.models.PrivateEndpointServiceConnectionStatus
+        :keyword description: The reason for approval/rejection of the connection.
+        :paramtype description: str
+        :keyword action_required: A message indicating if changes on the service provider require any
+         updates on the consumer.
+        :paramtype action_required: str
+        """
+        super().__init__(**kwargs)
+        self.status = status
+        self.description = description
+        self.action_required = action_required
+
+
+class ProtectedAppendWritesHistory(_serialization.Model):
+    """Protected append writes history setting for the blob container with Legal holds.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar allow_protected_append_writes_all: When enabled, new blocks can be written to both
+     'Append and Bock Blobs' while maintaining legal hold protection and compliance. Only new blocks
+     can be added and any existing blocks cannot be modified or deleted.
+    :vartype allow_protected_append_writes_all: bool
+    :ivar timestamp: Returns the date and time the tag was added.
+    :vartype timestamp: ~datetime.datetime
+    """
+
+    _validation = {
+        "timestamp": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "allow_protected_append_writes_all": {"key": "allowProtectedAppendWritesAll", "type": "bool"},
+        "timestamp": {"key": "timestamp", "type": "iso-8601"},
+    }
+
+    def __init__(self, *, allow_protected_append_writes_all: Optional[bool] = None, **kwargs: Any) -> None:
+        """
+        :keyword allow_protected_append_writes_all: When enabled, new blocks can be written to both
+         'Append and Bock Blobs' while maintaining legal hold protection and compliance. Only new blocks
+         can be added and any existing blocks cannot be modified or deleted.
+        :paramtype allow_protected_append_writes_all: bool
+        """
+        super().__init__(**kwargs)
+        self.allow_protected_append_writes_all = allow_protected_append_writes_all
+        self.timestamp = None
+
+
+class ProtocolSettings(_serialization.Model):
+    """Protocol settings for file service.
+
+    :ivar smb: Setting for SMB protocol.
+    :vartype smb: ~azure.mgmt.storage.v2024_01_01.models.SmbSetting
+    """
+
+    _attribute_map = {
+        "smb": {"key": "smb", "type": "SmbSetting"},
+    }
+
+    def __init__(self, *, smb: Optional["_models.SmbSetting"] = None, **kwargs: Any) -> None:
+        """
+        :keyword smb: Setting for SMB protocol.
+        :paramtype smb: ~azure.mgmt.storage.v2024_01_01.models.SmbSetting
+        """
+        super().__init__(**kwargs)
+        self.smb = smb
+
+
+class ProvisioningIssue(_serialization.Model):
+    """Describes provisioning issue for given NetworkSecurityPerimeterConfiguration.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar name: Name of the issue.
+    :vartype name: str
+    :ivar properties: Properties of provisioning issue.
+    :vartype properties: ~azure.mgmt.storage.v2024_01_01.models.ProvisioningIssueProperties
+    """
+
+    _validation = {
+        "properties": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "name": {"key": "name", "type": "str"},
+        "properties": {"key": "properties", "type": "ProvisioningIssueProperties"},
+    }
+
+    def __init__(self, *, name: Optional[str] = None, **kwargs: Any) -> None:
+        """
+        :keyword name: Name of the issue.
+        :paramtype name: str
+        """
+        super().__init__(**kwargs)
+        self.name = name
+        self.properties = None
+
+
+class ProvisioningIssueProperties(_serialization.Model):
+    """Properties of provisioning issue.
+
+    :ivar issue_type: Type of issue. Known values are: "Unknown" and
+     "ConfigurationPropagationFailure".
+    :vartype issue_type: str or ~azure.mgmt.storage.v2024_01_01.models.IssueType
+    :ivar severity: Severity of the issue. Known values are: "Warning" and "Error".
+    :vartype severity: str or ~azure.mgmt.storage.v2024_01_01.models.Severity
+    :ivar description: Description of the issue.
+    :vartype description: str
+    """
+
+    _attribute_map = {
+        "issue_type": {"key": "issueType", "type": "str"},
+        "severity": {"key": "severity", "type": "str"},
+        "description": {"key": "description", "type": "str"},
+    }
+
+    def __init__(
+        self,
+        *,
+        issue_type: Optional[Union[str, "_models.IssueType"]] = None,
+        severity: Optional[Union[str, "_models.Severity"]] = None,
+        description: Optional[str] = None,
+        **kwargs: Any
+    ) -> None:
+        """
+        :keyword issue_type: Type of issue. Known values are: "Unknown" and
+         "ConfigurationPropagationFailure".
+        :paramtype issue_type: str or ~azure.mgmt.storage.v2024_01_01.models.IssueType
+        :keyword severity: Severity of the issue. Known values are: "Warning" and "Error".
+        :paramtype severity: str or ~azure.mgmt.storage.v2024_01_01.models.Severity
+        :keyword description: Description of the issue.
+        :paramtype description: str
+        """
+        super().__init__(**kwargs)
+        self.issue_type = issue_type
+        self.severity = severity
+        self.description = description
+
+
+class QueueServiceProperties(Resource):
+    """The properties of a storage account’s Queue service.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar id: Fully qualified resource ID for the resource. Ex -
+     /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}.  # pylint: disable=line-too-long
+    :vartype id: str
+    :ivar name: The name of the resource.
+    :vartype name: str
+    :ivar type: The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or
+     "Microsoft.Storage/storageAccounts".
+    :vartype type: str
+    :ivar cors: Specifies CORS rules for the Queue service. You can include up to five CorsRule
+     elements in the request. If no CorsRule elements are included in the request body, all CORS
+     rules will be deleted, and CORS will be disabled for the Queue service.
+    :vartype cors: ~azure.mgmt.storage.v2024_01_01.models.CorsRules
+    """
+
+    _validation = {
+        "id": {"readonly": True},
+        "name": {"readonly": True},
+        "type": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "id": {"key": "id", "type": "str"},
+        "name": {"key": "name", "type": "str"},
+        "type": {"key": "type", "type": "str"},
+        "cors": {"key": "properties.cors", "type": "CorsRules"},
+    }
+
+    def __init__(self, *, cors: Optional["_models.CorsRules"] = None, **kwargs: Any) -> None:
+        """
+        :keyword cors: Specifies CORS rules for the Queue service. You can include up to five CorsRule
+         elements in the request. If no CorsRule elements are included in the request body, all CORS
+         rules will be deleted, and CORS will be disabled for the Queue service.
+        :paramtype cors: ~azure.mgmt.storage.v2024_01_01.models.CorsRules
+        """
+        super().__init__(**kwargs)
+        self.cors = cors
+
+
+class ResourceAccessRule(_serialization.Model):
+    """Resource Access Rule.
+
+    :ivar tenant_id: Tenant Id.
+    :vartype tenant_id: str
+    :ivar resource_id: Resource Id.
+    :vartype resource_id: str
+    """
+
+    _attribute_map = {
+        "tenant_id": {"key": "tenantId", "type": "str"},
+        "resource_id": {"key": "resourceId", "type": "str"},
+    }
+
+    def __init__(self, *, tenant_id: Optional[str] = None, resource_id: Optional[str] = None, **kwargs: Any) -> None:
+        """
+        :keyword tenant_id: Tenant Id.
+        :paramtype tenant_id: str
+        :keyword resource_id: Resource Id.
+        :paramtype resource_id: str
+        """
+        super().__init__(**kwargs)
+        self.tenant_id = tenant_id
+        self.resource_id = resource_id
+
+
+class RestorePolicyProperties(_serialization.Model):
+    """The blob service properties for blob restore policy.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    All required parameters must be populated in order to send to server.
+
+    :ivar enabled: Blob restore is enabled if set to true. Required.
+    :vartype enabled: bool
+    :ivar days: how long this blob can be restored. It should be great than zero and less than
+     DeleteRetentionPolicy.days.
+    :vartype days: int
+    :ivar last_enabled_time: Deprecated in favor of minRestoreTime property.
+    :vartype last_enabled_time: ~datetime.datetime
+    :ivar min_restore_time: Returns the minimum date and time that the restore can be started.
+    :vartype min_restore_time: ~datetime.datetime
+    """
+
+    _validation = {
+        "enabled": {"required": True},
+        "days": {"maximum": 365, "minimum": 1},
+        "last_enabled_time": {"readonly": True},
+        "min_restore_time": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "enabled": {"key": "enabled", "type": "bool"},
+        "days": {"key": "days", "type": "int"},
+        "last_enabled_time": {"key": "lastEnabledTime", "type": "iso-8601"},
+        "min_restore_time": {"key": "minRestoreTime", "type": "iso-8601"},
+    }
+
+    def __init__(self, *, enabled: bool, days: Optional[int] = None, **kwargs: Any) -> None:
+        """
+        :keyword enabled: Blob restore is enabled if set to true. Required.
+        :paramtype enabled: bool
+        :keyword days: how long this blob can be restored. It should be great than zero and less than
+         DeleteRetentionPolicy.days.
+        :paramtype days: int
+        """
+        super().__init__(**kwargs)
+        self.enabled = enabled
+        self.days = days
+        self.last_enabled_time = None
+        self.min_restore_time = None
+
+
+class Restriction(_serialization.Model):
+    """The restriction because of which SKU cannot be used.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar type: The type of restrictions. As of now only possible value for this is location.
+    :vartype type: str
+    :ivar values: The value of restrictions. If the restriction type is set to location. This would
+     be different locations where the SKU is restricted.
+    :vartype values: list[str]
+    :ivar reason_code: The reason for the restriction. As of now this can be "QuotaId" or
+     "NotAvailableForSubscription". Quota Id is set when the SKU has requiredQuotas parameter as the
+     subscription does not belong to that quota. The "NotAvailableForSubscription" is related to
+     capacity at DC. Known values are: "QuotaId" and "NotAvailableForSubscription".
+    :vartype reason_code: str or ~azure.mgmt.storage.v2024_01_01.models.ReasonCode
+    """
+
+    _validation = {
+        "type": {"readonly": True},
+        "values": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "type": {"key": "type", "type": "str"},
+        "values": {"key": "values", "type": "[str]"},
+        "reason_code": {"key": "reasonCode", "type": "str"},
+    }
+
+    def __init__(self, *, reason_code: Optional[Union[str, "_models.ReasonCode"]] = None, **kwargs: Any) -> None:
+        """
+        :keyword reason_code: The reason for the restriction. As of now this can be "QuotaId" or
+         "NotAvailableForSubscription". Quota Id is set when the SKU has requiredQuotas parameter as the
+         subscription does not belong to that quota. The "NotAvailableForSubscription" is related to
+         capacity at DC. Known values are: "QuotaId" and "NotAvailableForSubscription".
+        :paramtype reason_code: str or ~azure.mgmt.storage.v2024_01_01.models.ReasonCode
+        """
+        super().__init__(**kwargs)
+        self.type = None
+        self.values = None
+        self.reason_code = reason_code
+
+
+class RoutingPreference(_serialization.Model):
+    """Routing preference defines the type of network, either microsoft or internet routing to be used
+    to deliver the user data, the default option is microsoft routing.
+
+    :ivar routing_choice: Routing Choice defines the kind of network routing opted by the user.
+     Known values are: "MicrosoftRouting" and "InternetRouting".
+    :vartype routing_choice: str or ~azure.mgmt.storage.v2024_01_01.models.RoutingChoice
+    :ivar publish_microsoft_endpoints: A boolean flag which indicates whether microsoft routing
+     storage endpoints are to be published.
+    :vartype publish_microsoft_endpoints: bool
+    :ivar publish_internet_endpoints: A boolean flag which indicates whether internet routing
+     storage endpoints are to be published.
+    :vartype publish_internet_endpoints: bool
+    """
+
+    _attribute_map = {
+        "routing_choice": {"key": "routingChoice", "type": "str"},
+        "publish_microsoft_endpoints": {"key": "publishMicrosoftEndpoints", "type": "bool"},
+        "publish_internet_endpoints": {"key": "publishInternetEndpoints", "type": "bool"},
+    }
+
+    def __init__(
+        self,
+        *,
+        routing_choice: Optional[Union[str, "_models.RoutingChoice"]] = None,
+        publish_microsoft_endpoints: Optional[bool] = None,
+        publish_internet_endpoints: Optional[bool] = None,
+        **kwargs: Any
+    ) -> None:
+        """
+        :keyword routing_choice: Routing Choice defines the kind of network routing opted by the user.
+         Known values are: "MicrosoftRouting" and "InternetRouting".
+        :paramtype routing_choice: str or ~azure.mgmt.storage.v2024_01_01.models.RoutingChoice
+        :keyword publish_microsoft_endpoints: A boolean flag which indicates whether microsoft routing
+         storage endpoints are to be published.
+        :paramtype publish_microsoft_endpoints: bool
+        :keyword publish_internet_endpoints: A boolean flag which indicates whether internet routing
+         storage endpoints are to be published.
+        :paramtype publish_internet_endpoints: bool
+        """
+        super().__init__(**kwargs)
+        self.routing_choice = routing_choice
+        self.publish_microsoft_endpoints = publish_microsoft_endpoints
+        self.publish_internet_endpoints = publish_internet_endpoints
+
+
+class SasPolicy(_serialization.Model):
+    """SasPolicy assigned to the storage account.
+
+    All required parameters must be populated in order to send to server.
+
+    :ivar sas_expiration_period: The SAS expiration period, DD.HH:MM:SS. Required.
+    :vartype sas_expiration_period: str
+    :ivar expiration_action: The SAS Expiration Action defines the action to be performed when
+     sasPolicy.sasExpirationPeriod is violated. The 'Log' action can be used for audit purposes and
+     the 'Block' action can be used to block and deny the usage of SAS tokens that do not adhere to
+     the sas policy expiration period. Known values are: "Log" and "Block".
+    :vartype expiration_action: str or ~azure.mgmt.storage.v2024_01_01.models.ExpirationAction
+    """
+
+    _validation = {
+        "sas_expiration_period": {"required": True},
+        "expiration_action": {"required": True},
+    }
+
+    _attribute_map = {
+        "sas_expiration_period": {"key": "sasExpirationPeriod", "type": "str"},
+        "expiration_action": {"key": "expirationAction", "type": "str"},
+    }
+
+    def __init__(
+        self,
+        *,
+        sas_expiration_period: str,
+        expiration_action: Union[str, "_models.ExpirationAction"] = "Log",
+        **kwargs: Any
+    ) -> None:
+        """
+        :keyword sas_expiration_period: The SAS expiration period, DD.HH:MM:SS. Required.
+        :paramtype sas_expiration_period: str
+        :keyword expiration_action: The SAS Expiration Action defines the action to be performed when
+         sasPolicy.sasExpirationPeriod is violated. The 'Log' action can be used for audit purposes and
+         the 'Block' action can be used to block and deny the usage of SAS tokens that do not adhere to
+         the sas policy expiration period. Known values are: "Log" and "Block".
+        :paramtype expiration_action: str or ~azure.mgmt.storage.v2024_01_01.models.ExpirationAction
+        """
+        super().__init__(**kwargs)
+        self.sas_expiration_period = sas_expiration_period
+        self.expiration_action = expiration_action
+
+
+class ServiceSasParameters(_serialization.Model):
+    """The parameters to list service SAS credentials of a specific resource.
+
+    All required parameters must be populated in order to send to server.
+
+    :ivar canonicalized_resource: The canonical path to the signed resource. Required.
+    :vartype canonicalized_resource: str
+    :ivar resource: The signed services accessible with the service SAS. Possible values include:
+     Blob (b), Container (c), File (f), Share (s). Known values are: "b", "c", "f", and "s".
+    :vartype resource: str or ~azure.mgmt.storage.v2024_01_01.models.SignedResource
+    :ivar permissions: The signed permissions for the service SAS. Possible values include: Read
+     (r), Write (w), Delete (d), List (l), Add (a), Create (c), Update (u) and Process (p). Known
+     values are: "r", "d", "w", "l", "a", "c", "u", and "p".
+    :vartype permissions: str or ~azure.mgmt.storage.v2024_01_01.models.Permissions
+    :ivar ip_address_or_range: An IP address or a range of IP addresses from which to accept
+     requests.
+    :vartype ip_address_or_range: str
+    :ivar protocols: The protocol permitted for a request made with the account SAS. Known values
+     are: "https,http" and "https".
+    :vartype protocols: str or ~azure.mgmt.storage.v2024_01_01.models.HttpProtocol
+    :ivar shared_access_start_time: The time at which the SAS becomes valid.
+    :vartype shared_access_start_time: ~datetime.datetime
+    :ivar shared_access_expiry_time: The time at which the shared access signature becomes invalid.
+    :vartype shared_access_expiry_time: ~datetime.datetime
+    :ivar identifier: A unique value up to 64 characters in length that correlates to an access
+     policy specified for the container, queue, or table.
+    :vartype identifier: str
+    :ivar partition_key_start: The start of partition key.
+    :vartype partition_key_start: str
+    :ivar partition_key_end: The end of partition key.
+    :vartype partition_key_end: str
+    :ivar row_key_start: The start of row key.
+    :vartype row_key_start: str
+    :ivar row_key_end: The end of row key.
+    :vartype row_key_end: str
+    :ivar key_to_sign: The key to sign the account SAS token with.
+    :vartype key_to_sign: str
+    :ivar cache_control: The response header override for cache control.
+    :vartype cache_control: str
+    :ivar content_disposition: The response header override for content disposition.
+    :vartype content_disposition: str
+    :ivar content_encoding: The response header override for content encoding.
+    :vartype content_encoding: str
+    :ivar content_language: The response header override for content language.
+    :vartype content_language: str
+    :ivar content_type: The response header override for content type.
+    :vartype content_type: str
+    """
+
+    _validation = {
+        "canonicalized_resource": {"required": True},
+        "identifier": {"max_length": 64},
+    }
+
+    _attribute_map = {
+        "canonicalized_resource": {"key": "canonicalizedResource", "type": "str"},
+        "resource": {"key": "signedResource", "type": "str"},
+        "permissions": {"key": "signedPermission", "type": "str"},
+        "ip_address_or_range": {"key": "signedIp", "type": "str"},
+        "protocols": {"key": "signedProtocol", "type": "str"},
+        "shared_access_start_time": {"key": "signedStart", "type": "iso-8601"},
+        "shared_access_expiry_time": {"key": "signedExpiry", "type": "iso-8601"},
+        "identifier": {"key": "signedIdentifier", "type": "str"},
+        "partition_key_start": {"key": "startPk", "type": "str"},
+        "partition_key_end": {"key": "endPk", "type": "str"},
+        "row_key_start": {"key": "startRk", "type": "str"},
+        "row_key_end": {"key": "endRk", "type": "str"},
+        "key_to_sign": {"key": "keyToSign", "type": "str"},
+        "cache_control": {"key": "rscc", "type": "str"},
+        "content_disposition": {"key": "rscd", "type": "str"},
+        "content_encoding": {"key": "rsce", "type": "str"},
+        "content_language": {"key": "rscl", "type": "str"},
+        "content_type": {"key": "rsct", "type": "str"},
+    }
+
+    def __init__(
+        self,
+        *,
+        canonicalized_resource: str,
+        resource: Optional[Union[str, "_models.SignedResource"]] = None,
+        permissions: Optional[Union[str, "_models.Permissions"]] = None,
+        ip_address_or_range: Optional[str] = None,
+        protocols: Optional[Union[str, "_models.HttpProtocol"]] = None,
+        shared_access_start_time: Optional[datetime.datetime] = None,
+        shared_access_expiry_time: Optional[datetime.datetime] = None,
+        identifier: Optional[str] = None,
+        partition_key_start: Optional[str] = None,
+        partition_key_end: Optional[str] = None,
+        row_key_start: Optional[str] = None,
+        row_key_end: Optional[str] = None,
+        key_to_sign: Optional[str] = None,
+        cache_control: Optional[str] = None,
+        content_disposition: Optional[str] = None,
+        content_encoding: Optional[str] = None,
+        content_language: Optional[str] = None,
+        content_type: Optional[str] = None,
+        **kwargs: Any
+    ) -> None:
+        """
+        :keyword canonicalized_resource: The canonical path to the signed resource. Required.
+        :paramtype canonicalized_resource: str
+        :keyword resource: The signed services accessible with the service SAS. Possible values
+         include: Blob (b), Container (c), File (f), Share (s). Known values are: "b", "c", "f", and
+         "s".
+        :paramtype resource: str or ~azure.mgmt.storage.v2024_01_01.models.SignedResource
+        :keyword permissions: The signed permissions for the service SAS. Possible values include: Read
+         (r), Write (w), Delete (d), List (l), Add (a), Create (c), Update (u) and Process (p). Known
+         values are: "r", "d", "w", "l", "a", "c", "u", and "p".
+        :paramtype permissions: str or ~azure.mgmt.storage.v2024_01_01.models.Permissions
+        :keyword ip_address_or_range: An IP address or a range of IP addresses from which to accept
+         requests.
+        :paramtype ip_address_or_range: str
+        :keyword protocols: The protocol permitted for a request made with the account SAS. Known
+         values are: "https,http" and "https".
+        :paramtype protocols: str or ~azure.mgmt.storage.v2024_01_01.models.HttpProtocol
+        :keyword shared_access_start_time: The time at which the SAS becomes valid.
+        :paramtype shared_access_start_time: ~datetime.datetime
+        :keyword shared_access_expiry_time: The time at which the shared access signature becomes
+         invalid.
+        :paramtype shared_access_expiry_time: ~datetime.datetime
+        :keyword identifier: A unique value up to 64 characters in length that correlates to an access
+         policy specified for the container, queue, or table.
+        :paramtype identifier: str
+        :keyword partition_key_start: The start of partition key.
+        :paramtype partition_key_start: str
+        :keyword partition_key_end: The end of partition key.
+        :paramtype partition_key_end: str
+        :keyword row_key_start: The start of row key.
+        :paramtype row_key_start: str
+        :keyword row_key_end: The end of row key.
+        :paramtype row_key_end: str
+        :keyword key_to_sign: The key to sign the account SAS token with.
+        :paramtype key_to_sign: str
+        :keyword cache_control: The response header override for cache control.
+        :paramtype cache_control: str
+        :keyword content_disposition: The response header override for content disposition.
+        :paramtype content_disposition: str
+        :keyword content_encoding: The response header override for content encoding.
+        :paramtype content_encoding: str
+        :keyword content_language: The response header override for content language.
+        :paramtype content_language: str
+        :keyword content_type: The response header override for content type.
+        :paramtype content_type: str
+        """
+        super().__init__(**kwargs)
+        self.canonicalized_resource = canonicalized_resource
+        self.resource = resource
+        self.permissions = permissions
+        self.ip_address_or_range = ip_address_or_range
+        self.protocols = protocols
+        self.shared_access_start_time = shared_access_start_time
+        self.shared_access_expiry_time = shared_access_expiry_time
+        self.identifier = identifier
+        self.partition_key_start = partition_key_start
+        self.partition_key_end = partition_key_end
+        self.row_key_start = row_key_start
+        self.row_key_end = row_key_end
+        self.key_to_sign = key_to_sign
+        self.cache_control = cache_control
+        self.content_disposition = content_disposition
+        self.content_encoding = content_encoding
+        self.content_language = content_language
+        self.content_type = content_type
+
+
+class ServiceSpecification(_serialization.Model):
+    """One property of operation, include metric specifications.
+
+    :ivar metric_specifications: Metric specifications of operation.
+    :vartype metric_specifications:
+     list[~azure.mgmt.storage.v2024_01_01.models.MetricSpecification]
+    """
+
+    _attribute_map = {
+        "metric_specifications": {"key": "metricSpecifications", "type": "[MetricSpecification]"},
+    }
+
+    def __init__(
+        self, *, metric_specifications: Optional[List["_models.MetricSpecification"]] = None, **kwargs: Any
+    ) -> None:
+        """
+        :keyword metric_specifications: Metric specifications of operation.
+        :paramtype metric_specifications:
+         list[~azure.mgmt.storage.v2024_01_01.models.MetricSpecification]
+        """
+        super().__init__(**kwargs)
+        self.metric_specifications = metric_specifications
+
+
+class SignedIdentifier(_serialization.Model):
+    """SignedIdentifier.
+
+    :ivar id: An unique identifier of the stored access policy.
+    :vartype id: str
+    :ivar access_policy: Access policy.
+    :vartype access_policy: ~azure.mgmt.storage.v2024_01_01.models.AccessPolicy
+    """
+
+    _attribute_map = {
+        "id": {"key": "id", "type": "str"},
+        "access_policy": {"key": "accessPolicy", "type": "AccessPolicy"},
+    }
+
+    def __init__(
+        self,
+        *,
+        id: Optional[str] = None,  # pylint: disable=redefined-builtin
+        access_policy: Optional["_models.AccessPolicy"] = None,
+        **kwargs: Any
+    ) -> None:
+        """
+        :keyword id: An unique identifier of the stored access policy.
+        :paramtype id: str
+        :keyword access_policy: Access policy.
+        :paramtype access_policy: ~azure.mgmt.storage.v2024_01_01.models.AccessPolicy
+        """
+        super().__init__(**kwargs)
+        self.id = id
+        self.access_policy = access_policy
+
+
+class Sku(_serialization.Model):
+    """The SKU of the storage account.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    All required parameters must be populated in order to send to server.
+
+    :ivar name: The SKU name. Required for account creation; optional for update. Note that in
+     older versions, SKU name was called accountType. Required. Known values are: "Standard_LRS",
+     "Standard_GRS", "Standard_RAGRS", "Standard_ZRS", "Premium_LRS", "Premium_ZRS",
+     "Standard_GZRS", "Standard_RAGZRS", "StandardV2_LRS", "StandardV2_GRS", "StandardV2_ZRS",
+     "StandardV2_GZRS", "PremiumV2_LRS", and "PremiumV2_ZRS".
+    :vartype name: str or ~azure.mgmt.storage.v2024_01_01.models.SkuName
+    :ivar tier: The SKU tier. This is based on the SKU name. Known values are: "Standard" and
+     "Premium".
+    :vartype tier: str or ~azure.mgmt.storage.v2024_01_01.models.SkuTier
+    """
+
+    _validation = {
+        "name": {"required": True},
+        "tier": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "name": {"key": "name", "type": "str"},
+        "tier": {"key": "tier", "type": "str"},
+    }
+
+    def __init__(self, *, name: Union[str, "_models.SkuName"], **kwargs: Any) -> None:
+        """
+        :keyword name: The SKU name. Required for account creation; optional for update. Note that in
+         older versions, SKU name was called accountType. Required. Known values are: "Standard_LRS",
+         "Standard_GRS", "Standard_RAGRS", "Standard_ZRS", "Premium_LRS", "Premium_ZRS",
+         "Standard_GZRS", "Standard_RAGZRS", "StandardV2_LRS", "StandardV2_GRS", "StandardV2_ZRS",
+         "StandardV2_GZRS", "PremiumV2_LRS", and "PremiumV2_ZRS".
+        :paramtype name: str or ~azure.mgmt.storage.v2024_01_01.models.SkuName
+        """
+        super().__init__(**kwargs)
+        self.name = name
+        self.tier = None
+
+
+class SKUCapability(_serialization.Model):
+    """The capability information in the specified SKU, including file encryption, network ACLs,
+    change notification, etc.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar name: The name of capability, The capability information in the specified SKU, including
+     file encryption, network ACLs, change notification, etc.
+    :vartype name: str
+    :ivar value: A string value to indicate states of given capability. Possibly 'true' or 'false'.
+    :vartype value: str
+    """
+
+    _validation = {
+        "name": {"readonly": True},
+        "value": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "name": {"key": "name", "type": "str"},
+        "value": {"key": "value", "type": "str"},
+    }
+
+    def __init__(self, **kwargs: Any) -> None:
+        """ """
+        super().__init__(**kwargs)
+        self.name = None
+        self.value = None
+
+
+class SkuInformation(_serialization.Model):
+    """Storage SKU and its properties.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    All required parameters must be populated in order to send to server.
+
+    :ivar name: The SKU name. Required for account creation; optional for update. Note that in
+     older versions, SKU name was called accountType. Required. Known values are: "Standard_LRS",
+     "Standard_GRS", "Standard_RAGRS", "Standard_ZRS", "Premium_LRS", "Premium_ZRS",
+     "Standard_GZRS", "Standard_RAGZRS", "StandardV2_LRS", "StandardV2_GRS", "StandardV2_ZRS",
+     "StandardV2_GZRS", "PremiumV2_LRS", and "PremiumV2_ZRS".
+    :vartype name: str or ~azure.mgmt.storage.v2024_01_01.models.SkuName
+    :ivar tier: The SKU tier. This is based on the SKU name. Known values are: "Standard" and
+     "Premium".
+    :vartype tier: str or ~azure.mgmt.storage.v2024_01_01.models.SkuTier
+    :ivar resource_type: The type of the resource, usually it is 'storageAccounts'.
+    :vartype resource_type: str
+    :ivar kind: Indicates the type of storage account. Known values are: "Storage", "StorageV2",
+     "BlobStorage", "FileStorage", and "BlockBlobStorage".
+    :vartype kind: str or ~azure.mgmt.storage.v2024_01_01.models.Kind
+    :ivar locations: The set of locations that the SKU is available. This will be supported and
+     registered Azure Geo Regions (e.g. West US, East US, Southeast Asia, etc.).
+    :vartype locations: list[str]
+    :ivar capabilities: The capability information in the specified SKU, including file encryption,
+     network ACLs, change notification, etc.
+    :vartype capabilities: list[~azure.mgmt.storage.v2024_01_01.models.SKUCapability]
+    :ivar restrictions: The restrictions because of which SKU cannot be used. This is empty if
+     there are no restrictions.
+    :vartype restrictions: list[~azure.mgmt.storage.v2024_01_01.models.Restriction]
+    """
+
+    _validation = {
+        "name": {"required": True},
+        "tier": {"readonly": True},
+        "resource_type": {"readonly": True},
+        "kind": {"readonly": True},
+        "locations": {"readonly": True},
+        "capabilities": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "name": {"key": "name", "type": "str"},
+        "tier": {"key": "tier", "type": "str"},
+        "resource_type": {"key": "resourceType", "type": "str"},
+        "kind": {"key": "kind", "type": "str"},
+        "locations": {"key": "locations", "type": "[str]"},
+        "capabilities": {"key": "capabilities", "type": "[SKUCapability]"},
+        "restrictions": {"key": "restrictions", "type": "[Restriction]"},
+    }
+
+    def __init__(
+        self,
+        *,
+        name: Union[str, "_models.SkuName"],
+        restrictions: Optional[List["_models.Restriction"]] = None,
+        **kwargs: Any
+    ) -> None:
+        """
+        :keyword name: The SKU name. Required for account creation; optional for update. Note that in
+         older versions, SKU name was called accountType. Required. Known values are: "Standard_LRS",
+         "Standard_GRS", "Standard_RAGRS", "Standard_ZRS", "Premium_LRS", "Premium_ZRS",
+         "Standard_GZRS", "Standard_RAGZRS", "StandardV2_LRS", "StandardV2_GRS", "StandardV2_ZRS",
+         "StandardV2_GZRS", "PremiumV2_LRS", and "PremiumV2_ZRS".
+        :paramtype name: str or ~azure.mgmt.storage.v2024_01_01.models.SkuName
+        :keyword restrictions: The restrictions because of which SKU cannot be used. This is empty if
+         there are no restrictions.
+        :paramtype restrictions: list[~azure.mgmt.storage.v2024_01_01.models.Restriction]
+        """
+        super().__init__(**kwargs)
+        self.name = name
+        self.tier = None
+        self.resource_type = None
+        self.kind = None
+        self.locations = None
+        self.capabilities = None
+        self.restrictions = restrictions
+
+
+class SmbSetting(_serialization.Model):
+    """Setting for SMB protocol.
+
+    :ivar multichannel: Multichannel setting. Applies to Premium FileStorage only.
+    :vartype multichannel: ~azure.mgmt.storage.v2024_01_01.models.Multichannel
+    :ivar versions: SMB protocol versions supported by server. Valid values are SMB2.1, SMB3.0,
+     SMB3.1.1. Should be passed as a string with delimiter ';'.
+    :vartype versions: str
+    :ivar authentication_methods: SMB authentication methods supported by server. Valid values are
+     NTLMv2, Kerberos. Should be passed as a string with delimiter ';'.
+    :vartype authentication_methods: str
+    :ivar kerberos_ticket_encryption: Kerberos ticket encryption supported by server. Valid values
+     are RC4-HMAC, AES-256. Should be passed as a string with delimiter ';'.
+    :vartype kerberos_ticket_encryption: str
+    :ivar channel_encryption: SMB channel encryption supported by server. Valid values are
+     AES-128-CCM, AES-128-GCM, AES-256-GCM. Should be passed as a string with delimiter ';'.
+    :vartype channel_encryption: str
+    """
+
+    _attribute_map = {
+        "multichannel": {"key": "multichannel", "type": "Multichannel"},
+        "versions": {"key": "versions", "type": "str"},
+        "authentication_methods": {"key": "authenticationMethods", "type": "str"},
+        "kerberos_ticket_encryption": {"key": "kerberosTicketEncryption", "type": "str"},
+        "channel_encryption": {"key": "channelEncryption", "type": "str"},
+    }
+
+    def __init__(
+        self,
+        *,
+        multichannel: Optional["_models.Multichannel"] = None,
+        versions: Optional[str] = None,
+        authentication_methods: Optional[str] = None,
+        kerberos_ticket_encryption: Optional[str] = None,
+        channel_encryption: Optional[str] = None,
+        **kwargs: Any
+    ) -> None:
+        """
+        :keyword multichannel: Multichannel setting. Applies to Premium FileStorage only.
+        :paramtype multichannel: ~azure.mgmt.storage.v2024_01_01.models.Multichannel
+        :keyword versions: SMB protocol versions supported by server. Valid values are SMB2.1, SMB3.0,
+         SMB3.1.1. Should be passed as a string with delimiter ';'.
+        :paramtype versions: str
+        :keyword authentication_methods: SMB authentication methods supported by server. Valid values
+         are NTLMv2, Kerberos. Should be passed as a string with delimiter ';'.
+        :paramtype authentication_methods: str
+        :keyword kerberos_ticket_encryption: Kerberos ticket encryption supported by server. Valid
+         values are RC4-HMAC, AES-256. Should be passed as a string with delimiter ';'.
+        :paramtype kerberos_ticket_encryption: str
+        :keyword channel_encryption: SMB channel encryption supported by server. Valid values are
+         AES-128-CCM, AES-128-GCM, AES-256-GCM. Should be passed as a string with delimiter ';'.
+        :paramtype channel_encryption: str
+        """
+        super().__init__(**kwargs)
+        self.multichannel = multichannel
+        self.versions = versions
+        self.authentication_methods = authentication_methods
+        self.kerberos_ticket_encryption = kerberos_ticket_encryption
+        self.channel_encryption = channel_encryption
+
+
+class SshPublicKey(_serialization.Model):
+    """SshPublicKey.
+
+    :ivar description: Optional. It is used to store the function/usage of the key.
+    :vartype description: str
+    :ivar key: Ssh public key base64 encoded. The format should be: '\\ :code:`<keyType>`
+     :code:`<keyData>`', e.g. ssh-rsa AAAABBBB.
+    :vartype key: str
+    """
+
+    _attribute_map = {
+        "description": {"key": "description", "type": "str"},
+        "key": {"key": "key", "type": "str"},
+    }
+
+    def __init__(self, *, description: Optional[str] = None, key: Optional[str] = None, **kwargs: Any) -> None:
+        """
+        :keyword description: Optional. It is used to store the function/usage of the key.
+        :paramtype description: str
+        :keyword key: Ssh public key base64 encoded. The format should be: '\\ :code:`<keyType>`
+         :code:`<keyData>`', e.g. ssh-rsa AAAABBBB.
+        :paramtype key: str
+        """
+        super().__init__(**kwargs)
+        self.description = description
+        self.key = key
+
+
+class TrackedResource(Resource):
+    """The resource model definition for an Azure Resource Manager tracked top level resource which
+    has 'tags' and a 'location'.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    All required parameters must be populated in order to send to server.
+
+    :ivar id: Fully qualified resource ID for the resource. Ex -
+     /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}.  # pylint: disable=line-too-long
+    :vartype id: str
+    :ivar name: The name of the resource.
+    :vartype name: str
+    :ivar type: The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or
+     "Microsoft.Storage/storageAccounts".
+    :vartype type: str
+    :ivar tags: Resource tags.
+    :vartype tags: dict[str, str]
+    :ivar location: The geo-location where the resource lives. Required.
+    :vartype location: str
+    """
+
+    _validation = {
+        "id": {"readonly": True},
+        "name": {"readonly": True},
+        "type": {"readonly": True},
+        "location": {"required": True},
+    }
+
+    _attribute_map = {
+        "id": {"key": "id", "type": "str"},
+        "name": {"key": "name", "type": "str"},
+        "type": {"key": "type", "type": "str"},
+        "tags": {"key": "tags", "type": "{str}"},
+        "location": {"key": "location", "type": "str"},
+    }
+
+    def __init__(self, *, location: str, tags: Optional[Dict[str, str]] = None, **kwargs: Any) -> None:
+        """
+        :keyword tags: Resource tags.
+        :paramtype tags: dict[str, str]
+        :keyword location: The geo-location where the resource lives. Required.
+        :paramtype location: str
+        """
+        super().__init__(**kwargs)
+        self.tags = tags
+        self.location = location
+
+
+class StorageAccount(TrackedResource):
+    """The storage account.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    All required parameters must be populated in order to send to server.
+
+    :ivar id: Fully qualified resource ID for the resource. Ex -
+     /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}.  # pylint: disable=line-too-long
+    :vartype id: str
+    :ivar name: The name of the resource.
+    :vartype name: str
+    :ivar type: The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or
+     "Microsoft.Storage/storageAccounts".
+    :vartype type: str
+    :ivar tags: Resource tags.
+    :vartype tags: dict[str, str]
+    :ivar location: The geo-location where the resource lives. Required.
+    :vartype location: str
+    :ivar sku: Gets the SKU.
+    :vartype sku: ~azure.mgmt.storage.v2024_01_01.models.Sku
+    :ivar kind: Gets the Kind. Known values are: "Storage", "StorageV2", "BlobStorage",
+     "FileStorage", and "BlockBlobStorage".
+    :vartype kind: str or ~azure.mgmt.storage.v2024_01_01.models.Kind
+    :ivar identity: The identity of the resource.
+    :vartype identity: ~azure.mgmt.storage.v2024_01_01.models.Identity
+    :ivar extended_location: The extendedLocation of the resource.
+    :vartype extended_location: ~azure.mgmt.storage.v2024_01_01.models.ExtendedLocation
+    :ivar provisioning_state: Gets the status of the storage account at the time the operation was
+     called. Known values are: "Creating", "ResolvingDNS", "Succeeded",
+     "ValidateSubscriptionQuotaBegin", "ValidateSubscriptionQuotaEnd", "Deleting", "Canceled", and
+     "Failed".
+    :vartype provisioning_state: str or ~azure.mgmt.storage.v2024_01_01.models.ProvisioningState
+    :ivar primary_endpoints: Gets the URLs that are used to perform a retrieval of a public blob,
+     queue, or table object. Note that Standard_ZRS and Premium_LRS accounts only return the blob
+     endpoint.
+    :vartype primary_endpoints: ~azure.mgmt.storage.v2024_01_01.models.Endpoints
+    :ivar primary_location: Gets the location of the primary data center for the storage account.
+    :vartype primary_location: str
+    :ivar status_of_primary: Gets the status indicating whether the primary location of the storage
+     account is available or unavailable. Known values are: "available" and "unavailable".
+    :vartype status_of_primary: str or ~azure.mgmt.storage.v2024_01_01.models.AccountStatus
+    :ivar last_geo_failover_time: Gets the timestamp of the most recent instance of a failover to
+     the secondary location. Only the most recent timestamp is retained. This element is not
+     returned if there has never been a failover instance. Only available if the accountType is
+     Standard_GRS or Standard_RAGRS.
+    :vartype last_geo_failover_time: ~datetime.datetime
+    :ivar secondary_location: Gets the location of the geo-replicated secondary for the storage
+     account. Only available if the accountType is Standard_GRS or Standard_RAGRS.
+    :vartype secondary_location: str
+    :ivar status_of_secondary: Gets the status indicating whether the secondary location of the
+     storage account is available or unavailable. Only available if the SKU name is Standard_GRS or
+     Standard_RAGRS. Known values are: "available" and "unavailable".
+    :vartype status_of_secondary: str or ~azure.mgmt.storage.v2024_01_01.models.AccountStatus
+    :ivar creation_time: Gets the creation date and time of the storage account in UTC.
+    :vartype creation_time: ~datetime.datetime
+    :ivar custom_domain: Gets the custom domain the user assigned to this storage account.
+    :vartype custom_domain: ~azure.mgmt.storage.v2024_01_01.models.CustomDomain
+    :ivar sas_policy: SasPolicy assigned to the storage account.
+    :vartype sas_policy: ~azure.mgmt.storage.v2024_01_01.models.SasPolicy
+    :ivar key_policy: KeyPolicy assigned to the storage account.
+    :vartype key_policy: ~azure.mgmt.storage.v2024_01_01.models.KeyPolicy
+    :ivar key_creation_time: Storage account keys creation time.
+    :vartype key_creation_time: ~azure.mgmt.storage.v2024_01_01.models.KeyCreationTime
+    :ivar secondary_endpoints: Gets the URLs that are used to perform a retrieval of a public blob,
+     queue, or table object from the secondary location of the storage account. Only available if
+     the SKU name is Standard_RAGRS.
+    :vartype secondary_endpoints: ~azure.mgmt.storage.v2024_01_01.models.Endpoints
+    :ivar encryption: Encryption settings to be used for server-side encryption for the storage
+     account.
+    :vartype encryption: ~azure.mgmt.storage.v2024_01_01.models.Encryption
+    :ivar access_tier: Required for storage accounts where kind = BlobStorage. The access tier is
+     used for billing. The 'Premium' access tier is the default value for premium block blobs
+     storage account type and it cannot be changed for the premium block blobs storage account type.
+     Known values are: "Hot", "Cool", "Premium", and "Cold".
+    :vartype access_tier: str or ~azure.mgmt.storage.v2024_01_01.models.AccessTier
+    :ivar azure_files_identity_based_authentication: Provides the identity based authentication
+     settings for Azure Files.
+    :vartype azure_files_identity_based_authentication:
+     ~azure.mgmt.storage.v2024_01_01.models.AzureFilesIdentityBasedAuthentication
+    :ivar enable_https_traffic_only: Allows https traffic only to storage service if sets to true.
+    :vartype enable_https_traffic_only: bool
+    :ivar network_rule_set: Network rule set.
+    :vartype network_rule_set: ~azure.mgmt.storage.v2024_01_01.models.NetworkRuleSet
+    :ivar is_sftp_enabled: Enables Secure File Transfer Protocol, if set to true.
+    :vartype is_sftp_enabled: bool
+    :ivar is_local_user_enabled: Enables local users feature, if set to true.
+    :vartype is_local_user_enabled: bool
+    :ivar enable_extended_groups: Enables extended group support with local users feature, if set
+     to true.
+    :vartype enable_extended_groups: bool
+    :ivar is_hns_enabled: Account HierarchicalNamespace enabled if sets to true.
+    :vartype is_hns_enabled: bool
+    :ivar geo_replication_stats: Geo Replication Stats.
+    :vartype geo_replication_stats: ~azure.mgmt.storage.v2024_01_01.models.GeoReplicationStats
+    :ivar failover_in_progress: If the failover is in progress, the value will be true, otherwise,
+     it will be null.
+    :vartype failover_in_progress: bool
+    :ivar large_file_shares_state: Allow large file shares if sets to Enabled. It cannot be
+     disabled once it is enabled. Known values are: "Disabled" and "Enabled".
+    :vartype large_file_shares_state: str or
+     ~azure.mgmt.storage.v2024_01_01.models.LargeFileSharesState
+    :ivar private_endpoint_connections: List of private endpoint connection associated with the
+     specified storage account.
+    :vartype private_endpoint_connections:
+     list[~azure.mgmt.storage.v2024_01_01.models.PrivateEndpointConnection]
+    :ivar routing_preference: Maintains information about the network routing choice opted by the
+     user for data transfer.
+    :vartype routing_preference: ~azure.mgmt.storage.v2024_01_01.models.RoutingPreference
+    :ivar blob_restore_status: Blob restore status.
+    :vartype blob_restore_status: ~azure.mgmt.storage.v2024_01_01.models.BlobRestoreStatus
+    :ivar allow_blob_public_access: Allow or disallow public access to all blobs or containers in
+     the storage account. The default interpretation is false for this property.
+    :vartype allow_blob_public_access: bool
+    :ivar minimum_tls_version: Set the minimum TLS version to be permitted on requests to storage.
+     The default interpretation is TLS 1.0 for this property. Known values are: "TLS1_0", "TLS1_1",
+     "TLS1_2", and "TLS1_3".
+    :vartype minimum_tls_version: str or ~azure.mgmt.storage.v2024_01_01.models.MinimumTlsVersion
+    :ivar allow_shared_key_access: Indicates whether the storage account permits requests to be
+     authorized with the account access key via Shared Key. If false, then all requests, including
+     shared access signatures, must be authorized with Azure Active Directory (Azure AD). The
+     default value is null, which is equivalent to true.
+    :vartype allow_shared_key_access: bool
+    :ivar enable_nfs_v3: NFS 3.0 protocol support enabled if set to true.
+    :vartype enable_nfs_v3: bool
+    :ivar allow_cross_tenant_replication: Allow or disallow cross AAD tenant object replication.
+     Set this property to true for new or existing accounts only if object replication policies will
+     involve storage accounts in different AAD tenants. The default interpretation is false for new
+     accounts to follow best security practices by default.
+    :vartype allow_cross_tenant_replication: bool
+    :ivar default_to_o_auth_authentication: A boolean flag which indicates whether the default
+     authentication is OAuth or not. The default interpretation is false for this property.
+    :vartype default_to_o_auth_authentication: bool
+    :ivar public_network_access: Allow, disallow, or let Network Security Perimeter configuration
+     to evaluate public network access to Storage Account. Known values are: "Enabled", "Disabled",
+     and "SecuredByPerimeter".
+    :vartype public_network_access: str or
+     ~azure.mgmt.storage.v2024_01_01.models.PublicNetworkAccess
+    :ivar immutable_storage_with_versioning: The property is immutable and can only be set to true
+     at the account creation time. When set to true, it enables object level immutability for all
+     the containers in the account by default.
+    :vartype immutable_storage_with_versioning:
+     ~azure.mgmt.storage.v2024_01_01.models.ImmutableStorageAccount
+    :ivar allowed_copy_scope: Restrict copy to and from Storage Accounts within an AAD tenant or
+     with Private Links to the same VNet. Known values are: "PrivateLink" and "AAD".
+    :vartype allowed_copy_scope: str or ~azure.mgmt.storage.v2024_01_01.models.AllowedCopyScope
+    :ivar storage_account_sku_conversion_status: This property is readOnly and is set by server
+     during asynchronous storage account sku conversion operations.
+    :vartype storage_account_sku_conversion_status:
+     ~azure.mgmt.storage.v2024_01_01.models.StorageAccountSkuConversionStatus
+    :ivar dns_endpoint_type: Allows you to specify the type of endpoint. Set this to AzureDNSZone
+     to create a large number of accounts in a single subscription, which creates accounts in an
+     Azure DNS Zone and the endpoint URL will have an alphanumeric DNS Zone identifier. Known values
+     are: "Standard" and "AzureDnsZone".
+    :vartype dns_endpoint_type: str or ~azure.mgmt.storage.v2024_01_01.models.DnsEndpointType
+    :ivar is_sku_conversion_blocked: This property will be set to true or false on an event of
+     ongoing migration. Default value is null.
+    :vartype is_sku_conversion_blocked: bool
+    :ivar account_migration_in_progress: If customer initiated account migration is in progress,
+     the value will be true else it will be null.
+    :vartype account_migration_in_progress: bool
+    """
+
+    _validation = {
+        "id": {"readonly": True},
+        "name": {"readonly": True},
+        "type": {"readonly": True},
+        "location": {"required": True},
+        "sku": {"readonly": True},
+        "kind": {"readonly": True},
+        "provisioning_state": {"readonly": True},
+        "primary_endpoints": {"readonly": True},
+        "primary_location": {"readonly": True},
+        "status_of_primary": {"readonly": True},
+        "last_geo_failover_time": {"readonly": True},
+        "secondary_location": {"readonly": True},
+        "status_of_secondary": {"readonly": True},
+        "creation_time": {"readonly": True},
+        "custom_domain": {"readonly": True},
+        "sas_policy": {"readonly": True},
+        "key_policy": {"readonly": True},
+        "key_creation_time": {"readonly": True},
+        "secondary_endpoints": {"readonly": True},
+        "encryption": {"readonly": True},
+        "access_tier": {"readonly": True},
+        "network_rule_set": {"readonly": True},
+        "geo_replication_stats": {"readonly": True},
+        "failover_in_progress": {"readonly": True},
+        "private_endpoint_connections": {"readonly": True},
+        "blob_restore_status": {"readonly": True},
+        "is_sku_conversion_blocked": {"readonly": True},
+        "account_migration_in_progress": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "id": {"key": "id", "type": "str"},
+        "name": {"key": "name", "type": "str"},
+        "type": {"key": "type", "type": "str"},
+        "tags": {"key": "tags", "type": "{str}"},
+        "location": {"key": "location", "type": "str"},
+        "sku": {"key": "sku", "type": "Sku"},
+        "kind": {"key": "kind", "type": "str"},
+        "identity": {"key": "identity", "type": "Identity"},
+        "extended_location": {"key": "extendedLocation", "type": "ExtendedLocation"},
+        "provisioning_state": {"key": "properties.provisioningState", "type": "str"},
+        "primary_endpoints": {"key": "properties.primaryEndpoints", "type": "Endpoints"},
+        "primary_location": {"key": "properties.primaryLocation", "type": "str"},
+        "status_of_primary": {"key": "properties.statusOfPrimary", "type": "str"},
+        "last_geo_failover_time": {"key": "properties.lastGeoFailoverTime", "type": "iso-8601"},
+        "secondary_location": {"key": "properties.secondaryLocation", "type": "str"},
+        "status_of_secondary": {"key": "properties.statusOfSecondary", "type": "str"},
+        "creation_time": {"key": "properties.creationTime", "type": "iso-8601"},
+        "custom_domain": {"key": "properties.customDomain", "type": "CustomDomain"},
+        "sas_policy": {"key": "properties.sasPolicy", "type": "SasPolicy"},
+        "key_policy": {"key": "properties.keyPolicy", "type": "KeyPolicy"},
+        "key_creation_time": {"key": "properties.keyCreationTime", "type": "KeyCreationTime"},
+        "secondary_endpoints": {"key": "properties.secondaryEndpoints", "type": "Endpoints"},
+        "encryption": {"key": "properties.encryption", "type": "Encryption"},
+        "access_tier": {"key": "properties.accessTier", "type": "str"},
+        "azure_files_identity_based_authentication": {
+            "key": "properties.azureFilesIdentityBasedAuthentication",
+            "type": "AzureFilesIdentityBasedAuthentication",
+        },
+        "enable_https_traffic_only": {"key": "properties.supportsHttpsTrafficOnly", "type": "bool"},
+        "network_rule_set": {"key": "properties.networkAcls", "type": "NetworkRuleSet"},
+        "is_sftp_enabled": {"key": "properties.isSftpEnabled", "type": "bool"},
+        "is_local_user_enabled": {"key": "properties.isLocalUserEnabled", "type": "bool"},
+        "enable_extended_groups": {"key": "properties.enableExtendedGroups", "type": "bool"},
+        "is_hns_enabled": {"key": "properties.isHnsEnabled", "type": "bool"},
+        "geo_replication_stats": {"key": "properties.geoReplicationStats", "type": "GeoReplicationStats"},
+        "failover_in_progress": {"key": "properties.failoverInProgress", "type": "bool"},
+        "large_file_shares_state": {"key": "properties.largeFileSharesState", "type": "str"},
+        "private_endpoint_connections": {
+            "key": "properties.privateEndpointConnections",
+            "type": "[PrivateEndpointConnection]",
+        },
+        "routing_preference": {"key": "properties.routingPreference", "type": "RoutingPreference"},
+        "blob_restore_status": {"key": "properties.blobRestoreStatus", "type": "BlobRestoreStatus"},
+        "allow_blob_public_access": {"key": "properties.allowBlobPublicAccess", "type": "bool"},
+        "minimum_tls_version": {"key": "properties.minimumTlsVersion", "type": "str"},
+        "allow_shared_key_access": {"key": "properties.allowSharedKeyAccess", "type": "bool"},
+        "enable_nfs_v3": {"key": "properties.isNfsV3Enabled", "type": "bool"},
+        "allow_cross_tenant_replication": {"key": "properties.allowCrossTenantReplication", "type": "bool"},
+        "default_to_o_auth_authentication": {"key": "properties.defaultToOAuthAuthentication", "type": "bool"},
+        "public_network_access": {"key": "properties.publicNetworkAccess", "type": "str"},
+        "immutable_storage_with_versioning": {
+            "key": "properties.immutableStorageWithVersioning",
+            "type": "ImmutableStorageAccount",
+        },
+        "allowed_copy_scope": {"key": "properties.allowedCopyScope", "type": "str"},
+        "storage_account_sku_conversion_status": {
+            "key": "properties.storageAccountSkuConversionStatus",
+            "type": "StorageAccountSkuConversionStatus",
+        },
+        "dns_endpoint_type": {"key": "properties.dnsEndpointType", "type": "str"},
+        "is_sku_conversion_blocked": {"key": "properties.isSkuConversionBlocked", "type": "bool"},
+        "account_migration_in_progress": {"key": "properties.accountMigrationInProgress", "type": "bool"},
+    }
+
+    def __init__(  # pylint: disable=too-many-locals
+        self,
+        *,
+        location: str,
+        tags: Optional[Dict[str, str]] = None,
+        identity: Optional["_models.Identity"] = None,
+        extended_location: Optional["_models.ExtendedLocation"] = None,
+        azure_files_identity_based_authentication: Optional["_models.AzureFilesIdentityBasedAuthentication"] = None,
+        enable_https_traffic_only: Optional[bool] = None,
+        is_sftp_enabled: Optional[bool] = None,
+        is_local_user_enabled: Optional[bool] = None,
+        enable_extended_groups: Optional[bool] = None,
+        is_hns_enabled: Optional[bool] = None,
+        large_file_shares_state: Optional[Union[str, "_models.LargeFileSharesState"]] = None,
+        routing_preference: Optional["_models.RoutingPreference"] = None,
+        allow_blob_public_access: Optional[bool] = None,
+        minimum_tls_version: Optional[Union[str, "_models.MinimumTlsVersion"]] = None,
+        allow_shared_key_access: Optional[bool] = None,
+        enable_nfs_v3: Optional[bool] = None,
+        allow_cross_tenant_replication: Optional[bool] = None,
+        default_to_o_auth_authentication: Optional[bool] = None,
+        public_network_access: Optional[Union[str, "_models.PublicNetworkAccess"]] = None,
+        immutable_storage_with_versioning: Optional["_models.ImmutableStorageAccount"] = None,
+        allowed_copy_scope: Optional[Union[str, "_models.AllowedCopyScope"]] = None,
+        storage_account_sku_conversion_status: Optional["_models.StorageAccountSkuConversionStatus"] = None,
+        dns_endpoint_type: Optional[Union[str, "_models.DnsEndpointType"]] = None,
+        **kwargs: Any
+    ) -> None:
+        """
+        :keyword tags: Resource tags.
+        :paramtype tags: dict[str, str]
+        :keyword location: The geo-location where the resource lives. Required.
+        :paramtype location: str
+        :keyword identity: The identity of the resource.
+        :paramtype identity: ~azure.mgmt.storage.v2024_01_01.models.Identity
+        :keyword extended_location: The extendedLocation of the resource.
+        :paramtype extended_location: ~azure.mgmt.storage.v2024_01_01.models.ExtendedLocation
+        :keyword azure_files_identity_based_authentication: Provides the identity based authentication
+         settings for Azure Files.
+        :paramtype azure_files_identity_based_authentication:
+         ~azure.mgmt.storage.v2024_01_01.models.AzureFilesIdentityBasedAuthentication
+        :keyword enable_https_traffic_only: Allows https traffic only to storage service if sets to
+         true.
+        :paramtype enable_https_traffic_only: bool
+        :keyword is_sftp_enabled: Enables Secure File Transfer Protocol, if set to true.
+        :paramtype is_sftp_enabled: bool
+        :keyword is_local_user_enabled: Enables local users feature, if set to true.
+        :paramtype is_local_user_enabled: bool
+        :keyword enable_extended_groups: Enables extended group support with local users feature, if
+         set to true.
+        :paramtype enable_extended_groups: bool
+        :keyword is_hns_enabled: Account HierarchicalNamespace enabled if sets to true.
+        :paramtype is_hns_enabled: bool
+        :keyword large_file_shares_state: Allow large file shares if sets to Enabled. It cannot be
+         disabled once it is enabled. Known values are: "Disabled" and "Enabled".
+        :paramtype large_file_shares_state: str or
+         ~azure.mgmt.storage.v2024_01_01.models.LargeFileSharesState
+        :keyword routing_preference: Maintains information about the network routing choice opted by
+         the user for data transfer.
+        :paramtype routing_preference: ~azure.mgmt.storage.v2024_01_01.models.RoutingPreference
+        :keyword allow_blob_public_access: Allow or disallow public access to all blobs or containers
+         in the storage account. The default interpretation is false for this property.
+        :paramtype allow_blob_public_access: bool
+        :keyword minimum_tls_version: Set the minimum TLS version to be permitted on requests to
+         storage. The default interpretation is TLS 1.0 for this property. Known values are: "TLS1_0",
+         "TLS1_1", "TLS1_2", and "TLS1_3".
+        :paramtype minimum_tls_version: str or ~azure.mgmt.storage.v2024_01_01.models.MinimumTlsVersion
+        :keyword allow_shared_key_access: Indicates whether the storage account permits requests to be
+         authorized with the account access key via Shared Key. If false, then all requests, including
+         shared access signatures, must be authorized with Azure Active Directory (Azure AD). The
+         default value is null, which is equivalent to true.
+        :paramtype allow_shared_key_access: bool
+        :keyword enable_nfs_v3: NFS 3.0 protocol support enabled if set to true.
+        :paramtype enable_nfs_v3: bool
+        :keyword allow_cross_tenant_replication: Allow or disallow cross AAD tenant object replication.
+         Set this property to true for new or existing accounts only if object replication policies will
+         involve storage accounts in different AAD tenants. The default interpretation is false for new
+         accounts to follow best security practices by default.
+        :paramtype allow_cross_tenant_replication: bool
+        :keyword default_to_o_auth_authentication: A boolean flag which indicates whether the default
+         authentication is OAuth or not. The default interpretation is false for this property.
+        :paramtype default_to_o_auth_authentication: bool
+        :keyword public_network_access: Allow, disallow, or let Network Security Perimeter
+         configuration to evaluate public network access to Storage Account. Known values are:
+         "Enabled", "Disabled", and "SecuredByPerimeter".
+        :paramtype public_network_access: str or
+         ~azure.mgmt.storage.v2024_01_01.models.PublicNetworkAccess
+        :keyword immutable_storage_with_versioning: The property is immutable and can only be set to
+         true at the account creation time. When set to true, it enables object level immutability for
+         all the containers in the account by default.
+        :paramtype immutable_storage_with_versioning:
+         ~azure.mgmt.storage.v2024_01_01.models.ImmutableStorageAccount
+        :keyword allowed_copy_scope: Restrict copy to and from Storage Accounts within an AAD tenant or
+         with Private Links to the same VNet. Known values are: "PrivateLink" and "AAD".
+        :paramtype allowed_copy_scope: str or ~azure.mgmt.storage.v2024_01_01.models.AllowedCopyScope
+        :keyword storage_account_sku_conversion_status: This property is readOnly and is set by server
+         during asynchronous storage account sku conversion operations.
+        :paramtype storage_account_sku_conversion_status:
+         ~azure.mgmt.storage.v2024_01_01.models.StorageAccountSkuConversionStatus
+        :keyword dns_endpoint_type: Allows you to specify the type of endpoint. Set this to
+         AzureDNSZone to create a large number of accounts in a single subscription, which creates
+         accounts in an Azure DNS Zone and the endpoint URL will have an alphanumeric DNS Zone
+         identifier. Known values are: "Standard" and "AzureDnsZone".
+        :paramtype dns_endpoint_type: str or ~azure.mgmt.storage.v2024_01_01.models.DnsEndpointType
+        """
+        super().__init__(tags=tags, location=location, **kwargs)
+        self.sku = None
+        self.kind = None
+        self.identity = identity
+        self.extended_location = extended_location
+        self.provisioning_state = None
+        self.primary_endpoints = None
+        self.primary_location = None
+        self.status_of_primary = None
+        self.last_geo_failover_time = None
+        self.secondary_location = None
+        self.status_of_secondary = None
+        self.creation_time = None
+        self.custom_domain = None
+        self.sas_policy = None
+        self.key_policy = None
+        self.key_creation_time = None
+        self.secondary_endpoints = None
+        self.encryption = None
+        self.access_tier = None
+        self.azure_files_identity_based_authentication = azure_files_identity_based_authentication
+        self.enable_https_traffic_only = enable_https_traffic_only
+        self.network_rule_set = None
+        self.is_sftp_enabled = is_sftp_enabled
+        self.is_local_user_enabled = is_local_user_enabled
+        self.enable_extended_groups = enable_extended_groups
+        self.is_hns_enabled = is_hns_enabled
+        self.geo_replication_stats = None
+        self.failover_in_progress = None
+        self.large_file_shares_state = large_file_shares_state
+        self.private_endpoint_connections = None
+        self.routing_preference = routing_preference
+        self.blob_restore_status = None
+        self.allow_blob_public_access = allow_blob_public_access
+        self.minimum_tls_version = minimum_tls_version
+        self.allow_shared_key_access = allow_shared_key_access
+        self.enable_nfs_v3 = enable_nfs_v3
+        self.allow_cross_tenant_replication = allow_cross_tenant_replication
+        self.default_to_o_auth_authentication = default_to_o_auth_authentication
+        self.public_network_access = public_network_access
+        self.immutable_storage_with_versioning = immutable_storage_with_versioning
+        self.allowed_copy_scope = allowed_copy_scope
+        self.storage_account_sku_conversion_status = storage_account_sku_conversion_status
+        self.dns_endpoint_type = dns_endpoint_type
+        self.is_sku_conversion_blocked = None
+        self.account_migration_in_progress = None
+
+
+class StorageAccountCheckNameAvailabilityParameters(_serialization.Model):  # pylint: disable=name-too-long
+    """The parameters used to check the availability of the storage account name.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    All required parameters must be populated in order to send to server.
+
+    :ivar name: The storage account name. Required.
+    :vartype name: str
+    :ivar type: The type of resource, Microsoft.Storage/storageAccounts. Required. Default value is
+     "Microsoft.Storage/storageAccounts".
+    :vartype type: str
+    """
+
+    _validation = {
+        "name": {"required": True},
+        "type": {"required": True, "constant": True},
+    }
+
+    _attribute_map = {
+        "name": {"key": "name", "type": "str"},
+        "type": {"key": "type", "type": "str"},
+    }
+
+    type = "Microsoft.Storage/storageAccounts"
+
+    def __init__(self, *, name: str, **kwargs: Any) -> None:
+        """
+        :keyword name: The storage account name. Required.
+        :paramtype name: str
+        """
+        super().__init__(**kwargs)
+        self.name = name
+
+
+class StorageAccountCreateParameters(_serialization.Model):
+    """The parameters used when creating a storage account.
+
+    All required parameters must be populated in order to send to server.
+
+    :ivar sku: Required. Gets or sets the SKU name. Required.
+    :vartype sku: ~azure.mgmt.storage.v2024_01_01.models.Sku
+    :ivar kind: Required. Indicates the type of storage account. Required. Known values are:
+     "Storage", "StorageV2", "BlobStorage", "FileStorage", and "BlockBlobStorage".
+    :vartype kind: str or ~azure.mgmt.storage.v2024_01_01.models.Kind
+    :ivar location: Required. Gets or sets the location of the resource. This will be one of the
+     supported and registered Azure Geo Regions (e.g. West US, East US, Southeast Asia, etc.). The
+     geo region of a resource cannot be changed once it is created, but if an identical geo region
+     is specified on update, the request will succeed. Required.
+    :vartype location: str
+    :ivar extended_location: Optional. Set the extended location of the resource. If not set, the
+     storage account will be created in Azure main region. Otherwise it will be created in the
+     specified extended location.
+    :vartype extended_location: ~azure.mgmt.storage.v2024_01_01.models.ExtendedLocation
+    :ivar tags: Gets or sets a list of key value pairs that describe the resource. These tags can
+     be used for viewing and grouping this resource (across resource groups). A maximum of 15 tags
+     can be provided for a resource. Each tag must have a key with a length no greater than 128
+     characters and a value with a length no greater than 256 characters.
+    :vartype tags: dict[str, str]
+    :ivar identity: The identity of the resource.
+    :vartype identity: ~azure.mgmt.storage.v2024_01_01.models.Identity
+    :ivar allowed_copy_scope: Restrict copy to and from Storage Accounts within an AAD tenant or
+     with Private Links to the same VNet. Known values are: "PrivateLink" and "AAD".
+    :vartype allowed_copy_scope: str or ~azure.mgmt.storage.v2024_01_01.models.AllowedCopyScope
+    :ivar public_network_access: Allow, disallow, or let Network Security Perimeter configuration
+     to evaluate public network access to Storage Account. Value is optional but if passed in, must
+     be 'Enabled', 'Disabled' or 'SecuredByPerimeter'. Known values are: "Enabled", "Disabled", and
+     "SecuredByPerimeter".
+    :vartype public_network_access: str or
+     ~azure.mgmt.storage.v2024_01_01.models.PublicNetworkAccess
+    :ivar sas_policy: SasPolicy assigned to the storage account.
+    :vartype sas_policy: ~azure.mgmt.storage.v2024_01_01.models.SasPolicy
+    :ivar key_policy: KeyPolicy assigned to the storage account.
+    :vartype key_policy: ~azure.mgmt.storage.v2024_01_01.models.KeyPolicy
+    :ivar custom_domain: User domain assigned to the storage account. Name is the CNAME source.
+     Only one custom domain is supported per storage account at this time. To clear the existing
+     custom domain, use an empty string for the custom domain name property.
+    :vartype custom_domain: ~azure.mgmt.storage.v2024_01_01.models.CustomDomain
+    :ivar encryption: Encryption settings to be used for server-side encryption for the storage
+     account.
+    :vartype encryption: ~azure.mgmt.storage.v2024_01_01.models.Encryption
+    :ivar network_rule_set: Network rule set.
+    :vartype network_rule_set: ~azure.mgmt.storage.v2024_01_01.models.NetworkRuleSet
+    :ivar access_tier: Required for storage accounts where kind = BlobStorage. The access tier is
+     used for billing. The 'Premium' access tier is the default value for premium block blobs
+     storage account type and it cannot be changed for the premium block blobs storage account type.
+     Known values are: "Hot", "Cool", "Premium", and "Cold".
+    :vartype access_tier: str or ~azure.mgmt.storage.v2024_01_01.models.AccessTier
+    :ivar azure_files_identity_based_authentication: Provides the identity based authentication
+     settings for Azure Files.
+    :vartype azure_files_identity_based_authentication:
+     ~azure.mgmt.storage.v2024_01_01.models.AzureFilesIdentityBasedAuthentication
+    :ivar enable_https_traffic_only: Allows https traffic only to storage service if sets to true.
+     The default value is true since API version 2019-04-01.
+    :vartype enable_https_traffic_only: bool
+    :ivar is_sftp_enabled: Enables Secure File Transfer Protocol, if set to true.
+    :vartype is_sftp_enabled: bool
+    :ivar is_local_user_enabled: Enables local users feature, if set to true.
+    :vartype is_local_user_enabled: bool
+    :ivar enable_extended_groups: Enables extended group support with local users feature, if set
+     to true.
+    :vartype enable_extended_groups: bool
+    :ivar is_hns_enabled: Account HierarchicalNamespace enabled if sets to true.
+    :vartype is_hns_enabled: bool
+    :ivar large_file_shares_state: Allow large file shares if sets to Enabled. It cannot be
+     disabled once it is enabled. Known values are: "Disabled" and "Enabled".
+    :vartype large_file_shares_state: str or
+     ~azure.mgmt.storage.v2024_01_01.models.LargeFileSharesState
+    :ivar routing_preference: Maintains information about the network routing choice opted by the
+     user for data transfer.
+    :vartype routing_preference: ~azure.mgmt.storage.v2024_01_01.models.RoutingPreference
+    :ivar allow_blob_public_access: Allow or disallow public access to all blobs or containers in
+     the storage account. The default interpretation is false for this property.
+    :vartype allow_blob_public_access: bool
+    :ivar minimum_tls_version: Set the minimum TLS version to be permitted on requests to storage.
+     The default interpretation is TLS 1.0 for this property. Known values are: "TLS1_0", "TLS1_1",
+     "TLS1_2", and "TLS1_3".
+    :vartype minimum_tls_version: str or ~azure.mgmt.storage.v2024_01_01.models.MinimumTlsVersion
+    :ivar allow_shared_key_access: Indicates whether the storage account permits requests to be
+     authorized with the account access key via Shared Key. If false, then all requests, including
+     shared access signatures, must be authorized with Azure Active Directory (Azure AD). The
+     default value is null, which is equivalent to true.
+    :vartype allow_shared_key_access: bool
+    :ivar enable_nfs_v3: NFS 3.0 protocol support enabled if set to true.
+    :vartype enable_nfs_v3: bool
+    :ivar allow_cross_tenant_replication: Allow or disallow cross AAD tenant object replication.
+     Set this property to true for new or existing accounts only if object replication policies will
+     involve storage accounts in different AAD tenants. The default interpretation is false for new
+     accounts to follow best security practices by default.
+    :vartype allow_cross_tenant_replication: bool
+    :ivar default_to_o_auth_authentication: A boolean flag which indicates whether the default
+     authentication is OAuth or not. The default interpretation is false for this property.
+    :vartype default_to_o_auth_authentication: bool
+    :ivar immutable_storage_with_versioning: The property is immutable and can only be set to true
+     at the account creation time. When set to true, it enables object level immutability for all
+     the new containers in the account by default.
+    :vartype immutable_storage_with_versioning:
+     ~azure.mgmt.storage.v2024_01_01.models.ImmutableStorageAccount
+    :ivar dns_endpoint_type: Allows you to specify the type of endpoint. Set this to AzureDNSZone
+     to create a large number of accounts in a single subscription, which creates accounts in an
+     Azure DNS Zone and the endpoint URL will have an alphanumeric DNS Zone identifier. Known values
+     are: "Standard" and "AzureDnsZone".
+    :vartype dns_endpoint_type: str or ~azure.mgmt.storage.v2024_01_01.models.DnsEndpointType
+    """
+
+    _validation = {
+        "sku": {"required": True},
+        "kind": {"required": True},
+        "location": {"required": True},
+    }
+
+    _attribute_map = {
+        "sku": {"key": "sku", "type": "Sku"},
+        "kind": {"key": "kind", "type": "str"},
+        "location": {"key": "location", "type": "str"},
+        "extended_location": {"key": "extendedLocation", "type": "ExtendedLocation"},
+        "tags": {"key": "tags", "type": "{str}"},
+        "identity": {"key": "identity", "type": "Identity"},
+        "allowed_copy_scope": {"key": "properties.allowedCopyScope", "type": "str"},
+        "public_network_access": {"key": "properties.publicNetworkAccess", "type": "str"},
+        "sas_policy": {"key": "properties.sasPolicy", "type": "SasPolicy"},
+        "key_policy": {"key": "properties.keyPolicy", "type": "KeyPolicy"},
+        "custom_domain": {"key": "properties.customDomain", "type": "CustomDomain"},
+        "encryption": {"key": "properties.encryption", "type": "Encryption"},
+        "network_rule_set": {"key": "properties.networkAcls", "type": "NetworkRuleSet"},
+        "access_tier": {"key": "properties.accessTier", "type": "str"},
+        "azure_files_identity_based_authentication": {
+            "key": "properties.azureFilesIdentityBasedAuthentication",
+            "type": "AzureFilesIdentityBasedAuthentication",
+        },
+        "enable_https_traffic_only": {"key": "properties.supportsHttpsTrafficOnly", "type": "bool"},
+        "is_sftp_enabled": {"key": "properties.isSftpEnabled", "type": "bool"},
+        "is_local_user_enabled": {"key": "properties.isLocalUserEnabled", "type": "bool"},
+        "enable_extended_groups": {"key": "properties.enableExtendedGroups", "type": "bool"},
+        "is_hns_enabled": {"key": "properties.isHnsEnabled", "type": "bool"},
+        "large_file_shares_state": {"key": "properties.largeFileSharesState", "type": "str"},
+        "routing_preference": {"key": "properties.routingPreference", "type": "RoutingPreference"},
+        "allow_blob_public_access": {"key": "properties.allowBlobPublicAccess", "type": "bool"},
+        "minimum_tls_version": {"key": "properties.minimumTlsVersion", "type": "str"},
+        "allow_shared_key_access": {"key": "properties.allowSharedKeyAccess", "type": "bool"},
+        "enable_nfs_v3": {"key": "properties.isNfsV3Enabled", "type": "bool"},
+        "allow_cross_tenant_replication": {"key": "properties.allowCrossTenantReplication", "type": "bool"},
+        "default_to_o_auth_authentication": {"key": "properties.defaultToOAuthAuthentication", "type": "bool"},
+        "immutable_storage_with_versioning": {
+            "key": "properties.immutableStorageWithVersioning",
+            "type": "ImmutableStorageAccount",
+        },
+        "dns_endpoint_type": {"key": "properties.dnsEndpointType", "type": "str"},
+    }
+
+    def __init__(  # pylint: disable=too-many-locals
+        self,
+        *,
+        sku: "_models.Sku",
+        kind: Union[str, "_models.Kind"],
+        location: str,
+        extended_location: Optional["_models.ExtendedLocation"] = None,
+        tags: Optional[Dict[str, str]] = None,
+        identity: Optional["_models.Identity"] = None,
+        allowed_copy_scope: Optional[Union[str, "_models.AllowedCopyScope"]] = None,
+        public_network_access: Optional[Union[str, "_models.PublicNetworkAccess"]] = None,
+        sas_policy: Optional["_models.SasPolicy"] = None,
+        key_policy: Optional["_models.KeyPolicy"] = None,
+        custom_domain: Optional["_models.CustomDomain"] = None,
+        encryption: Optional["_models.Encryption"] = None,
+        network_rule_set: Optional["_models.NetworkRuleSet"] = None,
+        access_tier: Optional[Union[str, "_models.AccessTier"]] = None,
+        azure_files_identity_based_authentication: Optional["_models.AzureFilesIdentityBasedAuthentication"] = None,
+        enable_https_traffic_only: Optional[bool] = None,
+        is_sftp_enabled: Optional[bool] = None,
+        is_local_user_enabled: Optional[bool] = None,
+        enable_extended_groups: Optional[bool] = None,
+        is_hns_enabled: Optional[bool] = None,
+        large_file_shares_state: Optional[Union[str, "_models.LargeFileSharesState"]] = None,
+        routing_preference: Optional["_models.RoutingPreference"] = None,
+        allow_blob_public_access: Optional[bool] = None,
+        minimum_tls_version: Optional[Union[str, "_models.MinimumTlsVersion"]] = None,
+        allow_shared_key_access: Optional[bool] = None,
+        enable_nfs_v3: Optional[bool] = None,
+        allow_cross_tenant_replication: Optional[bool] = None,
+        default_to_o_auth_authentication: Optional[bool] = None,
+        immutable_storage_with_versioning: Optional["_models.ImmutableStorageAccount"] = None,
+        dns_endpoint_type: Optional[Union[str, "_models.DnsEndpointType"]] = None,
+        **kwargs: Any
+    ) -> None:
+        """
+        :keyword sku: Required. Gets or sets the SKU name. Required.
+        :paramtype sku: ~azure.mgmt.storage.v2024_01_01.models.Sku
+        :keyword kind: Required. Indicates the type of storage account. Required. Known values are:
+         "Storage", "StorageV2", "BlobStorage", "FileStorage", and "BlockBlobStorage".
+        :paramtype kind: str or ~azure.mgmt.storage.v2024_01_01.models.Kind
+        :keyword location: Required. Gets or sets the location of the resource. This will be one of the
+         supported and registered Azure Geo Regions (e.g. West US, East US, Southeast Asia, etc.). The
+         geo region of a resource cannot be changed once it is created, but if an identical geo region
+         is specified on update, the request will succeed. Required.
+        :paramtype location: str
+        :keyword extended_location: Optional. Set the extended location of the resource. If not set,
+         the storage account will be created in Azure main region. Otherwise it will be created in the
+         specified extended location.
+        :paramtype extended_location: ~azure.mgmt.storage.v2024_01_01.models.ExtendedLocation
+        :keyword tags: Gets or sets a list of key value pairs that describe the resource. These tags
+         can be used for viewing and grouping this resource (across resource groups). A maximum of 15
+         tags can be provided for a resource. Each tag must have a key with a length no greater than 128
+         characters and a value with a length no greater than 256 characters.
+        :paramtype tags: dict[str, str]
+        :keyword identity: The identity of the resource.
+        :paramtype identity: ~azure.mgmt.storage.v2024_01_01.models.Identity
+        :keyword allowed_copy_scope: Restrict copy to and from Storage Accounts within an AAD tenant or
+         with Private Links to the same VNet. Known values are: "PrivateLink" and "AAD".
+        :paramtype allowed_copy_scope: str or ~azure.mgmt.storage.v2024_01_01.models.AllowedCopyScope
+        :keyword public_network_access: Allow, disallow, or let Network Security Perimeter
+         configuration to evaluate public network access to Storage Account. Value is optional but if
+         passed in, must be 'Enabled', 'Disabled' or 'SecuredByPerimeter'. Known values are: "Enabled",
+         "Disabled", and "SecuredByPerimeter".
+        :paramtype public_network_access: str or
+         ~azure.mgmt.storage.v2024_01_01.models.PublicNetworkAccess
+        :keyword sas_policy: SasPolicy assigned to the storage account.
+        :paramtype sas_policy: ~azure.mgmt.storage.v2024_01_01.models.SasPolicy
+        :keyword key_policy: KeyPolicy assigned to the storage account.
+        :paramtype key_policy: ~azure.mgmt.storage.v2024_01_01.models.KeyPolicy
+        :keyword custom_domain: User domain assigned to the storage account. Name is the CNAME source.
+         Only one custom domain is supported per storage account at this time. To clear the existing
+         custom domain, use an empty string for the custom domain name property.
+        :paramtype custom_domain: ~azure.mgmt.storage.v2024_01_01.models.CustomDomain
+        :keyword encryption: Encryption settings to be used for server-side encryption for the storage
+         account.
+        :paramtype encryption: ~azure.mgmt.storage.v2024_01_01.models.Encryption
+        :keyword network_rule_set: Network rule set.
+        :paramtype network_rule_set: ~azure.mgmt.storage.v2024_01_01.models.NetworkRuleSet
+        :keyword access_tier: Required for storage accounts where kind = BlobStorage. The access tier
+         is used for billing. The 'Premium' access tier is the default value for premium block blobs
+         storage account type and it cannot be changed for the premium block blobs storage account type.
+         Known values are: "Hot", "Cool", "Premium", and "Cold".
+        :paramtype access_tier: str or ~azure.mgmt.storage.v2024_01_01.models.AccessTier
+        :keyword azure_files_identity_based_authentication: Provides the identity based authentication
+         settings for Azure Files.
+        :paramtype azure_files_identity_based_authentication:
+         ~azure.mgmt.storage.v2024_01_01.models.AzureFilesIdentityBasedAuthentication
+        :keyword enable_https_traffic_only: Allows https traffic only to storage service if sets to
+         true. The default value is true since API version 2019-04-01.
+        :paramtype enable_https_traffic_only: bool
+        :keyword is_sftp_enabled: Enables Secure File Transfer Protocol, if set to true.
+        :paramtype is_sftp_enabled: bool
+        :keyword is_local_user_enabled: Enables local users feature, if set to true.
+        :paramtype is_local_user_enabled: bool
+        :keyword enable_extended_groups: Enables extended group support with local users feature, if
+         set to true.
+        :paramtype enable_extended_groups: bool
+        :keyword is_hns_enabled: Account HierarchicalNamespace enabled if sets to true.
+        :paramtype is_hns_enabled: bool
+        :keyword large_file_shares_state: Allow large file shares if sets to Enabled. It cannot be
+         disabled once it is enabled. Known values are: "Disabled" and "Enabled".
+        :paramtype large_file_shares_state: str or
+         ~azure.mgmt.storage.v2024_01_01.models.LargeFileSharesState
+        :keyword routing_preference: Maintains information about the network routing choice opted by
+         the user for data transfer.
+        :paramtype routing_preference: ~azure.mgmt.storage.v2024_01_01.models.RoutingPreference
+        :keyword allow_blob_public_access: Allow or disallow public access to all blobs or containers
+         in the storage account. The default interpretation is false for this property.
+        :paramtype allow_blob_public_access: bool
+        :keyword minimum_tls_version: Set the minimum TLS version to be permitted on requests to
+         storage. The default interpretation is TLS 1.0 for this property. Known values are: "TLS1_0",
+         "TLS1_1", "TLS1_2", and "TLS1_3".
+        :paramtype minimum_tls_version: str or ~azure.mgmt.storage.v2024_01_01.models.MinimumTlsVersion
+        :keyword allow_shared_key_access: Indicates whether the storage account permits requests to be
+         authorized with the account access key via Shared Key. If false, then all requests, including
+         shared access signatures, must be authorized with Azure Active Directory (Azure AD). The
+         default value is null, which is equivalent to true.
+        :paramtype allow_shared_key_access: bool
+        :keyword enable_nfs_v3: NFS 3.0 protocol support enabled if set to true.
+        :paramtype enable_nfs_v3: bool
+        :keyword allow_cross_tenant_replication: Allow or disallow cross AAD tenant object replication.
+         Set this property to true for new or existing accounts only if object replication policies will
+         involve storage accounts in different AAD tenants. The default interpretation is false for new
+         accounts to follow best security practices by default.
+        :paramtype allow_cross_tenant_replication: bool
+        :keyword default_to_o_auth_authentication: A boolean flag which indicates whether the default
+         authentication is OAuth or not. The default interpretation is false for this property.
+        :paramtype default_to_o_auth_authentication: bool
+        :keyword immutable_storage_with_versioning: The property is immutable and can only be set to
+         true at the account creation time. When set to true, it enables object level immutability for
+         all the new containers in the account by default.
+        :paramtype immutable_storage_with_versioning:
+         ~azure.mgmt.storage.v2024_01_01.models.ImmutableStorageAccount
+        :keyword dns_endpoint_type: Allows you to specify the type of endpoint. Set this to
+         AzureDNSZone to create a large number of accounts in a single subscription, which creates
+         accounts in an Azure DNS Zone and the endpoint URL will have an alphanumeric DNS Zone
+         identifier. Known values are: "Standard" and "AzureDnsZone".
+        :paramtype dns_endpoint_type: str or ~azure.mgmt.storage.v2024_01_01.models.DnsEndpointType
+        """
+        super().__init__(**kwargs)
+        self.sku = sku
+        self.kind = kind
+        self.location = location
+        self.extended_location = extended_location
+        self.tags = tags
+        self.identity = identity
+        self.allowed_copy_scope = allowed_copy_scope
+        self.public_network_access = public_network_access
+        self.sas_policy = sas_policy
+        self.key_policy = key_policy
+        self.custom_domain = custom_domain
+        self.encryption = encryption
+        self.network_rule_set = network_rule_set
+        self.access_tier = access_tier
+        self.azure_files_identity_based_authentication = azure_files_identity_based_authentication
+        self.enable_https_traffic_only = enable_https_traffic_only
+        self.is_sftp_enabled = is_sftp_enabled
+        self.is_local_user_enabled = is_local_user_enabled
+        self.enable_extended_groups = enable_extended_groups
+        self.is_hns_enabled = is_hns_enabled
+        self.large_file_shares_state = large_file_shares_state
+        self.routing_preference = routing_preference
+        self.allow_blob_public_access = allow_blob_public_access
+        self.minimum_tls_version = minimum_tls_version
+        self.allow_shared_key_access = allow_shared_key_access
+        self.enable_nfs_v3 = enable_nfs_v3
+        self.allow_cross_tenant_replication = allow_cross_tenant_replication
+        self.default_to_o_auth_authentication = default_to_o_auth_authentication
+        self.immutable_storage_with_versioning = immutable_storage_with_versioning
+        self.dns_endpoint_type = dns_endpoint_type
+
+
+class StorageAccountInternetEndpoints(_serialization.Model):
+    """The URIs that are used to perform a retrieval of a public blob, file, web or dfs object via a
+    internet routing endpoint.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar blob: Gets the blob endpoint.
+    :vartype blob: str
+    :ivar file: Gets the file endpoint.
+    :vartype file: str
+    :ivar web: Gets the web endpoint.
+    :vartype web: str
+    :ivar dfs: Gets the dfs endpoint.
+    :vartype dfs: str
+    """
+
+    _validation = {
+        "blob": {"readonly": True},
+        "file": {"readonly": True},
+        "web": {"readonly": True},
+        "dfs": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "blob": {"key": "blob", "type": "str"},
+        "file": {"key": "file", "type": "str"},
+        "web": {"key": "web", "type": "str"},
+        "dfs": {"key": "dfs", "type": "str"},
+    }
+
+    def __init__(self, **kwargs: Any) -> None:
+        """ """
+        super().__init__(**kwargs)
+        self.blob = None
+        self.file = None
+        self.web = None
+        self.dfs = None
+
+
+class StorageAccountKey(_serialization.Model):
+    """An access key for the storage account.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar key_name: Name of the key.
+    :vartype key_name: str
+    :ivar value: Base 64-encoded value of the key.
+    :vartype value: str
+    :ivar permissions: Permissions for the key -- read-only or full permissions. Known values are:
+     "Read" and "Full".
+    :vartype permissions: str or ~azure.mgmt.storage.v2024_01_01.models.KeyPermission
+    :ivar creation_time: Creation time of the key, in round trip date format.
+    :vartype creation_time: ~datetime.datetime
+    """
+
+    _validation = {
+        "key_name": {"readonly": True},
+        "value": {"readonly": True},
+        "permissions": {"readonly": True},
+        "creation_time": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "key_name": {"key": "keyName", "type": "str"},
+        "value": {"key": "value", "type": "str"},
+        "permissions": {"key": "permissions", "type": "str"},
+        "creation_time": {"key": "creationTime", "type": "iso-8601"},
+    }
+
+    def __init__(self, **kwargs: Any) -> None:
+        """ """
+        super().__init__(**kwargs)
+        self.key_name = None
+        self.value = None
+        self.permissions = None
+        self.creation_time = None
+
+
+class StorageAccountListKeysResult(_serialization.Model):
+    """The response from the ListKeys operation.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar keys: Gets the list of storage account keys and their properties for the specified
+     storage account.
+    :vartype keys: list[~azure.mgmt.storage.v2024_01_01.models.StorageAccountKey]
+    """
+
+    _validation = {
+        "keys": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "keys": {"key": "keys", "type": "[StorageAccountKey]"},
+    }
+
+    def __init__(self, **kwargs: Any) -> None:
+        """ """
+        super().__init__(**kwargs)
+        self.keys = None
+
+
+class StorageAccountListResult(_serialization.Model):
+    """The response from the List Storage Accounts operation.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar value: Gets the list of storage accounts and their properties.
+    :vartype value: list[~azure.mgmt.storage.v2024_01_01.models.StorageAccount]
+    :ivar next_link: Request URL that can be used to query next page of storage accounts. Returned
+     when total number of requested storage accounts exceed maximum page size.
+    :vartype next_link: str
+    """
+
+    _validation = {
+        "value": {"readonly": True},
+        "next_link": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "value": {"key": "value", "type": "[StorageAccount]"},
+        "next_link": {"key": "nextLink", "type": "str"},
+    }
+
+    def __init__(self, **kwargs: Any) -> None:
+        """ """
+        super().__init__(**kwargs)
+        self.value = None
+        self.next_link = None
+
+
+class StorageAccountMicrosoftEndpoints(_serialization.Model):
+    """The URIs that are used to perform a retrieval of a public blob, queue, table, web or dfs object
+    via a microsoft routing endpoint.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar blob: Gets the blob endpoint.
+    :vartype blob: str
+    :ivar queue: Gets the queue endpoint.
+    :vartype queue: str
+    :ivar table: Gets the table endpoint.
+    :vartype table: str
+    :ivar file: Gets the file endpoint.
+    :vartype file: str
+    :ivar web: Gets the web endpoint.
+    :vartype web: str
+    :ivar dfs: Gets the dfs endpoint.
+    :vartype dfs: str
+    """
+
+    _validation = {
+        "blob": {"readonly": True},
+        "queue": {"readonly": True},
+        "table": {"readonly": True},
+        "file": {"readonly": True},
+        "web": {"readonly": True},
+        "dfs": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "blob": {"key": "blob", "type": "str"},
+        "queue": {"key": "queue", "type": "str"},
+        "table": {"key": "table", "type": "str"},
+        "file": {"key": "file", "type": "str"},
+        "web": {"key": "web", "type": "str"},
+        "dfs": {"key": "dfs", "type": "str"},
+    }
+
+    def __init__(self, **kwargs: Any) -> None:
+        """ """
+        super().__init__(**kwargs)
+        self.blob = None
+        self.queue = None
+        self.table = None
+        self.file = None
+        self.web = None
+        self.dfs = None
+
+
+class StorageAccountMigration(_serialization.Model):
+    """The parameters or status associated with an ongoing or enqueued storage account migration in
+    order to update its current SKU or region.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    All required parameters must be populated in order to send to server.
+
+    :ivar id: Migration Resource Id.
+    :vartype id: str
+    :ivar name: current value is 'default' for customer initiated migration.
+    :vartype name: str
+    :ivar type: SrpAccountMigrationType in ARM contract which is 'accountMigrations'.
+    :vartype type: str
+    :ivar target_sku_name: Target sku name for the account. Required. Known values are:
+     "Standard_LRS", "Standard_GRS", "Standard_RAGRS", "Standard_ZRS", "Premium_LRS", "Premium_ZRS",
+     "Standard_GZRS", "Standard_RAGZRS", "StandardV2_LRS", "StandardV2_GRS", "StandardV2_ZRS",
+     "StandardV2_GZRS", "PremiumV2_LRS", and "PremiumV2_ZRS".
+    :vartype target_sku_name: str or ~azure.mgmt.storage.v2024_01_01.models.SkuName
+    :ivar migration_status: Current status of migration. Known values are: "Invalid",
+     "SubmittedForConversion", "InProgress", "Complete", and "Failed".
+    :vartype migration_status: str or ~azure.mgmt.storage.v2024_01_01.models.MigrationStatus
+    :ivar migration_failed_reason: Error code for migration failure.
+    :vartype migration_failed_reason: str
+    :ivar migration_failed_detailed_reason: Reason for migration failure.
+    :vartype migration_failed_detailed_reason: str
+    """
+
+    _validation = {
+        "id": {"readonly": True},
+        "target_sku_name": {"required": True},
+        "migration_status": {"readonly": True},
+        "migration_failed_reason": {"readonly": True},
+        "migration_failed_detailed_reason": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "id": {"key": "id", "type": "str"},
+        "name": {"key": "name", "type": "str"},
+        "type": {"key": "type", "type": "str"},
+        "target_sku_name": {"key": "properties.targetSkuName", "type": "str"},
+        "migration_status": {"key": "properties.migrationStatus", "type": "str"},
+        "migration_failed_reason": {"key": "properties.migrationFailedReason", "type": "str"},
+        "migration_failed_detailed_reason": {"key": "properties.migrationFailedDetailedReason", "type": "str"},
+    }
+
+    def __init__(
+        self,
+        *,
+        target_sku_name: Union[str, "_models.SkuName"],
+        name: Optional[str] = None,
+        type: Optional[str] = None,
+        **kwargs: Any
+    ) -> None:
+        """
+        :keyword name: current value is 'default' for customer initiated migration.
+        :paramtype name: str
+        :keyword type: SrpAccountMigrationType in ARM contract which is 'accountMigrations'.
+        :paramtype type: str
+        :keyword target_sku_name: Target sku name for the account. Required. Known values are:
+         "Standard_LRS", "Standard_GRS", "Standard_RAGRS", "Standard_ZRS", "Premium_LRS", "Premium_ZRS",
+         "Standard_GZRS", "Standard_RAGZRS", "StandardV2_LRS", "StandardV2_GRS", "StandardV2_ZRS",
+         "StandardV2_GZRS", "PremiumV2_LRS", and "PremiumV2_ZRS".
+        :paramtype target_sku_name: str or ~azure.mgmt.storage.v2024_01_01.models.SkuName
+        """
+        super().__init__(**kwargs)
+        self.id = None
+        self.name = name
+        self.type = type
+        self.target_sku_name = target_sku_name
+        self.migration_status = None
+        self.migration_failed_reason = None
+        self.migration_failed_detailed_reason = None
+
+
+class StorageAccountRegenerateKeyParameters(_serialization.Model):
+    """The parameters used to regenerate the storage account key.
+
+    All required parameters must be populated in order to send to server.
+
+    :ivar key_name: The name of storage keys that want to be regenerated, possible values are key1,
+     key2, kerb1, kerb2. Required.
+    :vartype key_name: str
+    """
+
+    _validation = {
+        "key_name": {"required": True},
+    }
+
+    _attribute_map = {
+        "key_name": {"key": "keyName", "type": "str"},
+    }
+
+    def __init__(self, *, key_name: str, **kwargs: Any) -> None:
+        """
+        :keyword key_name: The name of storage keys that want to be regenerated, possible values are
+         key1, key2, kerb1, kerb2. Required.
+        :paramtype key_name: str
+        """
+        super().__init__(**kwargs)
+        self.key_name = key_name
+
+
+class StorageAccountSkuConversionStatus(_serialization.Model):
+    """This defines the sku conversion status object for asynchronous sku conversions.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar sku_conversion_status: This property indicates the current sku conversion status. Known
+     values are: "InProgress", "Succeeded", and "Failed".
+    :vartype sku_conversion_status: str or
+     ~azure.mgmt.storage.v2024_01_01.models.SkuConversionStatus
+    :ivar target_sku_name: This property represents the target sku name to which the account sku is
+     being converted asynchronously. Known values are: "Standard_LRS", "Standard_GRS",
+     "Standard_RAGRS", "Standard_ZRS", "Premium_LRS", "Premium_ZRS", "Standard_GZRS",
+     "Standard_RAGZRS", "StandardV2_LRS", "StandardV2_GRS", "StandardV2_ZRS", "StandardV2_GZRS",
+     "PremiumV2_LRS", and "PremiumV2_ZRS".
+    :vartype target_sku_name: str or ~azure.mgmt.storage.v2024_01_01.models.SkuName
+    :ivar start_time: This property represents the sku conversion start time.
+    :vartype start_time: str
+    :ivar end_time: This property represents the sku conversion end time.
+    :vartype end_time: str
+    """
+
+    _validation = {
+        "sku_conversion_status": {"readonly": True},
+        "start_time": {"readonly": True},
+        "end_time": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "sku_conversion_status": {"key": "skuConversionStatus", "type": "str"},
+        "target_sku_name": {"key": "targetSkuName", "type": "str"},
+        "start_time": {"key": "startTime", "type": "str"},
+        "end_time": {"key": "endTime", "type": "str"},
+    }
+
+    def __init__(self, *, target_sku_name: Optional[Union[str, "_models.SkuName"]] = None, **kwargs: Any) -> None:
+        """
+        :keyword target_sku_name: This property represents the target sku name to which the account sku
+         is being converted asynchronously. Known values are: "Standard_LRS", "Standard_GRS",
+         "Standard_RAGRS", "Standard_ZRS", "Premium_LRS", "Premium_ZRS", "Standard_GZRS",
+         "Standard_RAGZRS", "StandardV2_LRS", "StandardV2_GRS", "StandardV2_ZRS", "StandardV2_GZRS",
+         "PremiumV2_LRS", and "PremiumV2_ZRS".
+        :paramtype target_sku_name: str or ~azure.mgmt.storage.v2024_01_01.models.SkuName
+        """
+        super().__init__(**kwargs)
+        self.sku_conversion_status = None
+        self.target_sku_name = target_sku_name
+        self.start_time = None
+        self.end_time = None
+
+
+class StorageAccountUpdateParameters(_serialization.Model):
+    """The parameters that can be provided when updating the storage account properties.
+
+    :ivar sku: Gets or sets the SKU name. Note that the SKU name cannot be updated to Standard_ZRS,
+     Premium_LRS or Premium_ZRS, nor can accounts of those SKU names be updated to any other value.
+    :vartype sku: ~azure.mgmt.storage.v2024_01_01.models.Sku
+    :ivar tags: Gets or sets a list of key value pairs that describe the resource. These tags can
+     be used in viewing and grouping this resource (across resource groups). A maximum of 15 tags
+     can be provided for a resource. Each tag must have a key no greater in length than 128
+     characters and a value no greater in length than 256 characters.
+    :vartype tags: dict[str, str]
+    :ivar identity: The identity of the resource.
+    :vartype identity: ~azure.mgmt.storage.v2024_01_01.models.Identity
+    :ivar kind: Optional. Indicates the type of storage account. Currently only StorageV2 value
+     supported by server. Known values are: "Storage", "StorageV2", "BlobStorage", "FileStorage",
+     and "BlockBlobStorage".
+    :vartype kind: str or ~azure.mgmt.storage.v2024_01_01.models.Kind
+    :ivar custom_domain: Custom domain assigned to the storage account by the user. Name is the
+     CNAME source. Only one custom domain is supported per storage account at this time. To clear
+     the existing custom domain, use an empty string for the custom domain name property.
+    :vartype custom_domain: ~azure.mgmt.storage.v2024_01_01.models.CustomDomain
+    :ivar encryption: Not applicable. Azure Storage encryption at rest is enabled by default for
+     all storage accounts and cannot be disabled.
+    :vartype encryption: ~azure.mgmt.storage.v2024_01_01.models.Encryption
+    :ivar sas_policy: SasPolicy assigned to the storage account.
+    :vartype sas_policy: ~azure.mgmt.storage.v2024_01_01.models.SasPolicy
+    :ivar key_policy: KeyPolicy assigned to the storage account.
+    :vartype key_policy: ~azure.mgmt.storage.v2024_01_01.models.KeyPolicy
+    :ivar access_tier: Required for storage accounts where kind = BlobStorage. The access tier is
+     used for billing. The 'Premium' access tier is the default value for premium block blobs
+     storage account type and it cannot be changed for the premium block blobs storage account type.
+     Known values are: "Hot", "Cool", "Premium", and "Cold".
+    :vartype access_tier: str or ~azure.mgmt.storage.v2024_01_01.models.AccessTier
+    :ivar azure_files_identity_based_authentication: Provides the identity based authentication
+     settings for Azure Files.
+    :vartype azure_files_identity_based_authentication:
+     ~azure.mgmt.storage.v2024_01_01.models.AzureFilesIdentityBasedAuthentication
+    :ivar enable_https_traffic_only: Allows https traffic only to storage service if sets to true.
+    :vartype enable_https_traffic_only: bool
+    :ivar is_sftp_enabled: Enables Secure File Transfer Protocol, if set to true.
+    :vartype is_sftp_enabled: bool
+    :ivar is_local_user_enabled: Enables local users feature, if set to true.
+    :vartype is_local_user_enabled: bool
+    :ivar enable_extended_groups: Enables extended group support with local users feature, if set
+     to true.
+    :vartype enable_extended_groups: bool
+    :ivar network_rule_set: Network rule set.
+    :vartype network_rule_set: ~azure.mgmt.storage.v2024_01_01.models.NetworkRuleSet
+    :ivar large_file_shares_state: Allow large file shares if sets to Enabled. It cannot be
+     disabled once it is enabled. Known values are: "Disabled" and "Enabled".
+    :vartype large_file_shares_state: str or
+     ~azure.mgmt.storage.v2024_01_01.models.LargeFileSharesState
+    :ivar routing_preference: Maintains information about the network routing choice opted by the
+     user for data transfer.
+    :vartype routing_preference: ~azure.mgmt.storage.v2024_01_01.models.RoutingPreference
+    :ivar allow_blob_public_access: Allow or disallow public access to all blobs or containers in
+     the storage account. The default interpretation is false for this property.
+    :vartype allow_blob_public_access: bool
+    :ivar minimum_tls_version: Set the minimum TLS version to be permitted on requests to storage.
+     The default interpretation is TLS 1.0 for this property. Known values are: "TLS1_0", "TLS1_1",
+     "TLS1_2", and "TLS1_3".
+    :vartype minimum_tls_version: str or ~azure.mgmt.storage.v2024_01_01.models.MinimumTlsVersion
+    :ivar allow_shared_key_access: Indicates whether the storage account permits requests to be
+     authorized with the account access key via Shared Key. If false, then all requests, including
+     shared access signatures, must be authorized with Azure Active Directory (Azure AD). The
+     default value is null, which is equivalent to true.
+    :vartype allow_shared_key_access: bool
+    :ivar allow_cross_tenant_replication: Allow or disallow cross AAD tenant object replication.
+     Set this property to true for new or existing accounts only if object replication policies will
+     involve storage accounts in different AAD tenants. The default interpretation is false for new
+     accounts to follow best security practices by default.
+    :vartype allow_cross_tenant_replication: bool
+    :ivar default_to_o_auth_authentication: A boolean flag which indicates whether the default
+     authentication is OAuth or not. The default interpretation is false for this property.
+    :vartype default_to_o_auth_authentication: bool
+    :ivar public_network_access: Allow, disallow, or let Network Security Perimeter configuration
+     to evaluate public network access to Storage Account. Value is optional but if passed in, must
+     be 'Enabled', 'Disabled' or 'SecuredByPerimeter'. Known values are: "Enabled", "Disabled", and
+     "SecuredByPerimeter".
+    :vartype public_network_access: str or
+     ~azure.mgmt.storage.v2024_01_01.models.PublicNetworkAccess
+    :ivar immutable_storage_with_versioning: The property is immutable and can only be set to true
+     at the account creation time. When set to true, it enables object level immutability for all
+     the containers in the account by default.
+    :vartype immutable_storage_with_versioning:
+     ~azure.mgmt.storage.v2024_01_01.models.ImmutableStorageAccount
+    :ivar allowed_copy_scope: Restrict copy to and from Storage Accounts within an AAD tenant or
+     with Private Links to the same VNet. Known values are: "PrivateLink" and "AAD".
+    :vartype allowed_copy_scope: str or ~azure.mgmt.storage.v2024_01_01.models.AllowedCopyScope
+    :ivar dns_endpoint_type: Allows you to specify the type of endpoint. Set this to AzureDNSZone
+     to create a large number of accounts in a single subscription, which creates accounts in an
+     Azure DNS Zone and the endpoint URL will have an alphanumeric DNS Zone identifier. Known values
+     are: "Standard" and "AzureDnsZone".
+    :vartype dns_endpoint_type: str or ~azure.mgmt.storage.v2024_01_01.models.DnsEndpointType
+    """
+
+    _attribute_map = {
+        "sku": {"key": "sku", "type": "Sku"},
+        "tags": {"key": "tags", "type": "{str}"},
+        "identity": {"key": "identity", "type": "Identity"},
+        "kind": {"key": "kind", "type": "str"},
+        "custom_domain": {"key": "properties.customDomain", "type": "CustomDomain"},
+        "encryption": {"key": "properties.encryption", "type": "Encryption"},
+        "sas_policy": {"key": "properties.sasPolicy", "type": "SasPolicy"},
+        "key_policy": {"key": "properties.keyPolicy", "type": "KeyPolicy"},
+        "access_tier": {"key": "properties.accessTier", "type": "str"},
+        "azure_files_identity_based_authentication": {
+            "key": "properties.azureFilesIdentityBasedAuthentication",
+            "type": "AzureFilesIdentityBasedAuthentication",
+        },
+        "enable_https_traffic_only": {"key": "properties.supportsHttpsTrafficOnly", "type": "bool"},
+        "is_sftp_enabled": {"key": "properties.isSftpEnabled", "type": "bool"},
+        "is_local_user_enabled": {"key": "properties.isLocalUserEnabled", "type": "bool"},
+        "enable_extended_groups": {"key": "properties.enableExtendedGroups", "type": "bool"},
+        "network_rule_set": {"key": "properties.networkAcls", "type": "NetworkRuleSet"},
+        "large_file_shares_state": {"key": "properties.largeFileSharesState", "type": "str"},
+        "routing_preference": {"key": "properties.routingPreference", "type": "RoutingPreference"},
+        "allow_blob_public_access": {"key": "properties.allowBlobPublicAccess", "type": "bool"},
+        "minimum_tls_version": {"key": "properties.minimumTlsVersion", "type": "str"},
+        "allow_shared_key_access": {"key": "properties.allowSharedKeyAccess", "type": "bool"},
+        "allow_cross_tenant_replication": {"key": "properties.allowCrossTenantReplication", "type": "bool"},
+        "default_to_o_auth_authentication": {"key": "properties.defaultToOAuthAuthentication", "type": "bool"},
+        "public_network_access": {"key": "properties.publicNetworkAccess", "type": "str"},
+        "immutable_storage_with_versioning": {
+            "key": "properties.immutableStorageWithVersioning",
+            "type": "ImmutableStorageAccount",
+        },
+        "allowed_copy_scope": {"key": "properties.allowedCopyScope", "type": "str"},
+        "dns_endpoint_type": {"key": "properties.dnsEndpointType", "type": "str"},
+    }
+
+    def __init__(  # pylint: disable=too-many-locals
+        self,
+        *,
+        sku: Optional["_models.Sku"] = None,
+        tags: Optional[Dict[str, str]] = None,
+        identity: Optional["_models.Identity"] = None,
+        kind: Optional[Union[str, "_models.Kind"]] = None,
+        custom_domain: Optional["_models.CustomDomain"] = None,
+        encryption: Optional["_models.Encryption"] = None,
+        sas_policy: Optional["_models.SasPolicy"] = None,
+        key_policy: Optional["_models.KeyPolicy"] = None,
+        access_tier: Optional[Union[str, "_models.AccessTier"]] = None,
+        azure_files_identity_based_authentication: Optional["_models.AzureFilesIdentityBasedAuthentication"] = None,
+        enable_https_traffic_only: Optional[bool] = None,
+        is_sftp_enabled: Optional[bool] = None,
+        is_local_user_enabled: Optional[bool] = None,
+        enable_extended_groups: Optional[bool] = None,
+        network_rule_set: Optional["_models.NetworkRuleSet"] = None,
+        large_file_shares_state: Optional[Union[str, "_models.LargeFileSharesState"]] = None,
+        routing_preference: Optional["_models.RoutingPreference"] = None,
+        allow_blob_public_access: Optional[bool] = None,
+        minimum_tls_version: Optional[Union[str, "_models.MinimumTlsVersion"]] = None,
+        allow_shared_key_access: Optional[bool] = None,
+        allow_cross_tenant_replication: Optional[bool] = None,
+        default_to_o_auth_authentication: Optional[bool] = None,
+        public_network_access: Optional[Union[str, "_models.PublicNetworkAccess"]] = None,
+        immutable_storage_with_versioning: Optional["_models.ImmutableStorageAccount"] = None,
+        allowed_copy_scope: Optional[Union[str, "_models.AllowedCopyScope"]] = None,
+        dns_endpoint_type: Optional[Union[str, "_models.DnsEndpointType"]] = None,
+        **kwargs: Any
+    ) -> None:
+        """
+        :keyword sku: Gets or sets the SKU name. Note that the SKU name cannot be updated to
+         Standard_ZRS, Premium_LRS or Premium_ZRS, nor can accounts of those SKU names be updated to any
+         other value.
+        :paramtype sku: ~azure.mgmt.storage.v2024_01_01.models.Sku
+        :keyword tags: Gets or sets a list of key value pairs that describe the resource. These tags
+         can be used in viewing and grouping this resource (across resource groups). A maximum of 15
+         tags can be provided for a resource. Each tag must have a key no greater in length than 128
+         characters and a value no greater in length than 256 characters.
+        :paramtype tags: dict[str, str]
+        :keyword identity: The identity of the resource.
+        :paramtype identity: ~azure.mgmt.storage.v2024_01_01.models.Identity
+        :keyword kind: Optional. Indicates the type of storage account. Currently only StorageV2 value
+         supported by server. Known values are: "Storage", "StorageV2", "BlobStorage", "FileStorage",
+         and "BlockBlobStorage".
+        :paramtype kind: str or ~azure.mgmt.storage.v2024_01_01.models.Kind
+        :keyword custom_domain: Custom domain assigned to the storage account by the user. Name is the
+         CNAME source. Only one custom domain is supported per storage account at this time. To clear
+         the existing custom domain, use an empty string for the custom domain name property.
+        :paramtype custom_domain: ~azure.mgmt.storage.v2024_01_01.models.CustomDomain
+        :keyword encryption: Not applicable. Azure Storage encryption at rest is enabled by default for
+         all storage accounts and cannot be disabled.
+        :paramtype encryption: ~azure.mgmt.storage.v2024_01_01.models.Encryption
+        :keyword sas_policy: SasPolicy assigned to the storage account.
+        :paramtype sas_policy: ~azure.mgmt.storage.v2024_01_01.models.SasPolicy
+        :keyword key_policy: KeyPolicy assigned to the storage account.
+        :paramtype key_policy: ~azure.mgmt.storage.v2024_01_01.models.KeyPolicy
+        :keyword access_tier: Required for storage accounts where kind = BlobStorage. The access tier
+         is used for billing. The 'Premium' access tier is the default value for premium block blobs
+         storage account type and it cannot be changed for the premium block blobs storage account type.
+         Known values are: "Hot", "Cool", "Premium", and "Cold".
+        :paramtype access_tier: str or ~azure.mgmt.storage.v2024_01_01.models.AccessTier
+        :keyword azure_files_identity_based_authentication: Provides the identity based authentication
+         settings for Azure Files.
+        :paramtype azure_files_identity_based_authentication:
+         ~azure.mgmt.storage.v2024_01_01.models.AzureFilesIdentityBasedAuthentication
+        :keyword enable_https_traffic_only: Allows https traffic only to storage service if sets to
+         true.
+        :paramtype enable_https_traffic_only: bool
+        :keyword is_sftp_enabled: Enables Secure File Transfer Protocol, if set to true.
+        :paramtype is_sftp_enabled: bool
+        :keyword is_local_user_enabled: Enables local users feature, if set to true.
+        :paramtype is_local_user_enabled: bool
+        :keyword enable_extended_groups: Enables extended group support with local users feature, if
+         set to true.
+        :paramtype enable_extended_groups: bool
+        :keyword network_rule_set: Network rule set.
+        :paramtype network_rule_set: ~azure.mgmt.storage.v2024_01_01.models.NetworkRuleSet
+        :keyword large_file_shares_state: Allow large file shares if sets to Enabled. It cannot be
+         disabled once it is enabled. Known values are: "Disabled" and "Enabled".
+        :paramtype large_file_shares_state: str or
+         ~azure.mgmt.storage.v2024_01_01.models.LargeFileSharesState
+        :keyword routing_preference: Maintains information about the network routing choice opted by
+         the user for data transfer.
+        :paramtype routing_preference: ~azure.mgmt.storage.v2024_01_01.models.RoutingPreference
+        :keyword allow_blob_public_access: Allow or disallow public access to all blobs or containers
+         in the storage account. The default interpretation is false for this property.
+        :paramtype allow_blob_public_access: bool
+        :keyword minimum_tls_version: Set the minimum TLS version to be permitted on requests to
+         storage. The default interpretation is TLS 1.0 for this property. Known values are: "TLS1_0",
+         "TLS1_1", "TLS1_2", and "TLS1_3".
+        :paramtype minimum_tls_version: str or ~azure.mgmt.storage.v2024_01_01.models.MinimumTlsVersion
+        :keyword allow_shared_key_access: Indicates whether the storage account permits requests to be
+         authorized with the account access key via Shared Key. If false, then all requests, including
+         shared access signatures, must be authorized with Azure Active Directory (Azure AD). The
+         default value is null, which is equivalent to true.
+        :paramtype allow_shared_key_access: bool
+        :keyword allow_cross_tenant_replication: Allow or disallow cross AAD tenant object replication.
+         Set this property to true for new or existing accounts only if object replication policies will
+         involve storage accounts in different AAD tenants. The default interpretation is false for new
+         accounts to follow best security practices by default.
+        :paramtype allow_cross_tenant_replication: bool
+        :keyword default_to_o_auth_authentication: A boolean flag which indicates whether the default
+         authentication is OAuth or not. The default interpretation is false for this property.
+        :paramtype default_to_o_auth_authentication: bool
+        :keyword public_network_access: Allow, disallow, or let Network Security Perimeter
+         configuration to evaluate public network access to Storage Account. Value is optional but if
+         passed in, must be 'Enabled', 'Disabled' or 'SecuredByPerimeter'. Known values are: "Enabled",
+         "Disabled", and "SecuredByPerimeter".
+        :paramtype public_network_access: str or
+         ~azure.mgmt.storage.v2024_01_01.models.PublicNetworkAccess
+        :keyword immutable_storage_with_versioning: The property is immutable and can only be set to
+         true at the account creation time. When set to true, it enables object level immutability for
+         all the containers in the account by default.
+        :paramtype immutable_storage_with_versioning:
+         ~azure.mgmt.storage.v2024_01_01.models.ImmutableStorageAccount
+        :keyword allowed_copy_scope: Restrict copy to and from Storage Accounts within an AAD tenant or
+         with Private Links to the same VNet. Known values are: "PrivateLink" and "AAD".
+        :paramtype allowed_copy_scope: str or ~azure.mgmt.storage.v2024_01_01.models.AllowedCopyScope
+        :keyword dns_endpoint_type: Allows you to specify the type of endpoint. Set this to
+         AzureDNSZone to create a large number of accounts in a single subscription, which creates
+         accounts in an Azure DNS Zone and the endpoint URL will have an alphanumeric DNS Zone
+         identifier. Known values are: "Standard" and "AzureDnsZone".
+        :paramtype dns_endpoint_type: str or ~azure.mgmt.storage.v2024_01_01.models.DnsEndpointType
+        """
+        super().__init__(**kwargs)
+        self.sku = sku
+        self.tags = tags
+        self.identity = identity
+        self.kind = kind
+        self.custom_domain = custom_domain
+        self.encryption = encryption
+        self.sas_policy = sas_policy
+        self.key_policy = key_policy
+        self.access_tier = access_tier
+        self.azure_files_identity_based_authentication = azure_files_identity_based_authentication
+        self.enable_https_traffic_only = enable_https_traffic_only
+        self.is_sftp_enabled = is_sftp_enabled
+        self.is_local_user_enabled = is_local_user_enabled
+        self.enable_extended_groups = enable_extended_groups
+        self.network_rule_set = network_rule_set
+        self.large_file_shares_state = large_file_shares_state
+        self.routing_preference = routing_preference
+        self.allow_blob_public_access = allow_blob_public_access
+        self.minimum_tls_version = minimum_tls_version
+        self.allow_shared_key_access = allow_shared_key_access
+        self.allow_cross_tenant_replication = allow_cross_tenant_replication
+        self.default_to_o_auth_authentication = default_to_o_auth_authentication
+        self.public_network_access = public_network_access
+        self.immutable_storage_with_versioning = immutable_storage_with_versioning
+        self.allowed_copy_scope = allowed_copy_scope
+        self.dns_endpoint_type = dns_endpoint_type
+
+
+class StorageQueue(Resource):
+    """StorageQueue.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar id: Fully qualified resource ID for the resource. Ex -
+     /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}.  # pylint: disable=line-too-long
+    :vartype id: str
+    :ivar name: The name of the resource.
+    :vartype name: str
+    :ivar type: The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or
+     "Microsoft.Storage/storageAccounts".
+    :vartype type: str
+    :ivar metadata: A name-value pair that represents queue metadata.
+    :vartype metadata: dict[str, str]
+    :ivar approximate_message_count: Integer indicating an approximate number of messages in the
+     queue. This number is not lower than the actual number of messages in the queue, but could be
+     higher.
+    :vartype approximate_message_count: int
+    """
+
+    _validation = {
+        "id": {"readonly": True},
+        "name": {"readonly": True},
+        "type": {"readonly": True},
+        "approximate_message_count": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "id": {"key": "id", "type": "str"},
+        "name": {"key": "name", "type": "str"},
+        "type": {"key": "type", "type": "str"},
+        "metadata": {"key": "properties.metadata", "type": "{str}"},
+        "approximate_message_count": {"key": "properties.approximateMessageCount", "type": "int"},
+    }
+
+    def __init__(self, *, metadata: Optional[Dict[str, str]] = None, **kwargs: Any) -> None:
+        """
+        :keyword metadata: A name-value pair that represents queue metadata.
+        :paramtype metadata: dict[str, str]
+        """
+        super().__init__(**kwargs)
+        self.metadata = metadata
+        self.approximate_message_count = None
+
+
+class StorageSkuListResult(_serialization.Model):
+    """The response from the List Storage SKUs operation.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar value: Get the list result of storage SKUs and their properties.
+    :vartype value: list[~azure.mgmt.storage.v2024_01_01.models.SkuInformation]
+    """
+
+    _validation = {
+        "value": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "value": {"key": "value", "type": "[SkuInformation]"},
+    }
+
+    def __init__(self, **kwargs: Any) -> None:
+        """ """
+        super().__init__(**kwargs)
+        self.value = None
+
+
+class StorageTaskAssignment(Resource):
+    """The storage task assignment.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    All required parameters must be populated in order to send to server.
+
+    :ivar id: Fully qualified resource ID for the resource. Ex -
+     /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}.  # pylint: disable=line-too-long
+    :vartype id: str
+    :ivar name: The name of the resource.
+    :vartype name: str
+    :ivar type: The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or
+     "Microsoft.Storage/storageAccounts".
+    :vartype type: str
+    :ivar properties: Properties of the storage task assignment. Required.
+    :vartype properties: ~azure.mgmt.storage.v2024_01_01.models.StorageTaskAssignmentProperties
+    """
+
+    _validation = {
+        "id": {"readonly": True},
+        "name": {"readonly": True},
+        "type": {"readonly": True},
+        "properties": {"required": True},
+    }
+
+    _attribute_map = {
+        "id": {"key": "id", "type": "str"},
+        "name": {"key": "name", "type": "str"},
+        "type": {"key": "type", "type": "str"},
+        "properties": {"key": "properties", "type": "StorageTaskAssignmentProperties"},
+    }
+
+    def __init__(self, *, properties: "_models.StorageTaskAssignmentProperties", **kwargs: Any) -> None:
+        """
+        :keyword properties: Properties of the storage task assignment. Required.
+        :paramtype properties: ~azure.mgmt.storage.v2024_01_01.models.StorageTaskAssignmentProperties
+        """
+        super().__init__(**kwargs)
+        self.properties = properties
+
+
+class StorageTaskAssignmentExecutionContext(_serialization.Model):
+    """Execution context of the storage task assignment.
+
+    All required parameters must be populated in order to send to server.
+
+    :ivar target: Execution target of the storage task assignment.
+    :vartype target: ~azure.mgmt.storage.v2024_01_01.models.ExecutionTarget
+    :ivar trigger: Execution trigger of the storage task assignment. Required.
+    :vartype trigger: ~azure.mgmt.storage.v2024_01_01.models.ExecutionTrigger
+    """
+
+    _validation = {
+        "trigger": {"required": True},
+    }
+
+    _attribute_map = {
+        "target": {"key": "target", "type": "ExecutionTarget"},
+        "trigger": {"key": "trigger", "type": "ExecutionTrigger"},
+    }
+
+    def __init__(
+        self, *, trigger: "_models.ExecutionTrigger", target: Optional["_models.ExecutionTarget"] = None, **kwargs: Any
+    ) -> None:
+        """
+        :keyword target: Execution target of the storage task assignment.
+        :paramtype target: ~azure.mgmt.storage.v2024_01_01.models.ExecutionTarget
+        :keyword trigger: Execution trigger of the storage task assignment. Required.
+        :paramtype trigger: ~azure.mgmt.storage.v2024_01_01.models.ExecutionTrigger
+        """
+        super().__init__(**kwargs)
+        self.target = target
+        self.trigger = trigger
+
+
+class StorageTaskAssignmentProperties(_serialization.Model):
+    """Properties of the storage task assignment.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    All required parameters must be populated in order to send to server.
+
+    :ivar task_id: Id of the corresponding storage task. Required.
+    :vartype task_id: str
+    :ivar enabled: Whether the storage task assignment is enabled or not. Required.
+    :vartype enabled: bool
+    :ivar description: Text that describes the purpose of the storage task assignment. Required.
+    :vartype description: str
+    :ivar execution_context: The storage task assignment execution context. Required.
+    :vartype execution_context:
+     ~azure.mgmt.storage.v2024_01_01.models.StorageTaskAssignmentExecutionContext
+    :ivar report: The storage task assignment report. Required.
+    :vartype report: ~azure.mgmt.storage.v2024_01_01.models.StorageTaskAssignmentReport
+    :ivar provisioning_state: Represents the provisioning state of the storage task assignment.
+     Known values are: "Creating", "ResolvingDNS", "Succeeded", "ValidateSubscriptionQuotaBegin",
+     "ValidateSubscriptionQuotaEnd", "Deleting", "Canceled", and "Failed".
+    :vartype provisioning_state: str or ~azure.mgmt.storage.v2024_01_01.models.ProvisioningState
+    :ivar run_status: Run status of storage task assignment.
+    :vartype run_status: ~azure.mgmt.storage.v2024_01_01.models.StorageTaskReportProperties
+    """
+
+    _validation = {
+        "task_id": {"required": True},
+        "enabled": {"required": True},
+        "description": {"required": True},
+        "execution_context": {"required": True},
+        "report": {"required": True},
+        "provisioning_state": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "task_id": {"key": "taskId", "type": "str"},
+        "enabled": {"key": "enabled", "type": "bool"},
+        "description": {"key": "description", "type": "str"},
+        "execution_context": {"key": "executionContext", "type": "StorageTaskAssignmentExecutionContext"},
+        "report": {"key": "report", "type": "StorageTaskAssignmentReport"},
+        "provisioning_state": {"key": "provisioningState", "type": "str"},
+        "run_status": {"key": "runStatus", "type": "StorageTaskReportProperties"},
+    }
+
+    def __init__(
+        self,
+        *,
+        task_id: str,
+        enabled: bool,
+        description: str,
+        execution_context: "_models.StorageTaskAssignmentExecutionContext",
+        report: "_models.StorageTaskAssignmentReport",
+        run_status: Optional["_models.StorageTaskReportProperties"] = None,
+        **kwargs: Any
+    ) -> None:
+        """
+        :keyword task_id: Id of the corresponding storage task. Required.
+        :paramtype task_id: str
+        :keyword enabled: Whether the storage task assignment is enabled or not. Required.
+        :paramtype enabled: bool
+        :keyword description: Text that describes the purpose of the storage task assignment. Required.
+        :paramtype description: str
+        :keyword execution_context: The storage task assignment execution context. Required.
+        :paramtype execution_context:
+         ~azure.mgmt.storage.v2024_01_01.models.StorageTaskAssignmentExecutionContext
+        :keyword report: The storage task assignment report. Required.
+        :paramtype report: ~azure.mgmt.storage.v2024_01_01.models.StorageTaskAssignmentReport
+        :keyword run_status: Run status of storage task assignment.
+        :paramtype run_status: ~azure.mgmt.storage.v2024_01_01.models.StorageTaskReportProperties
+        """
+        super().__init__(**kwargs)
+        self.task_id = task_id
+        self.enabled = enabled
+        self.description = description
+        self.execution_context = execution_context
+        self.report = report
+        self.provisioning_state = None
+        self.run_status = run_status
+
+
+class StorageTaskAssignmentReport(_serialization.Model):
+    """The storage task assignment report.
+
+    All required parameters must be populated in order to send to server.
+
+    :ivar prefix: The container prefix for the location of storage task assignment report.
+     Required.
+    :vartype prefix: str
+    """
+
+    _validation = {
+        "prefix": {"required": True},
+    }
+
+    _attribute_map = {
+        "prefix": {"key": "prefix", "type": "str"},
+    }
+
+    def __init__(self, *, prefix: str, **kwargs: Any) -> None:
+        """
+        :keyword prefix: The container prefix for the location of storage task assignment report.
+         Required.
+        :paramtype prefix: str
+        """
+        super().__init__(**kwargs)
+        self.prefix = prefix
+
+
+class StorageTaskAssignmentsList(_serialization.Model):
+    """List of storage task assignments for the storage account.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar value: Gets the list of storage task assignments and their properties.
+    :vartype value: list[~azure.mgmt.storage.v2024_01_01.models.StorageTaskAssignment]
+    :ivar next_link: Request URL that can be used to query next page of storage task assignments.
+     Returned when total number of requested storage task assignments exceed maximum page size.
+    :vartype next_link: str
+    """
+
+    _validation = {
+        "value": {"readonly": True},
+        "next_link": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "value": {"key": "value", "type": "[StorageTaskAssignment]"},
+        "next_link": {"key": "nextLink", "type": "str"},
+    }
+
+    def __init__(self, **kwargs: Any) -> None:
+        """ """
+        super().__init__(**kwargs)
+        self.value = None
+        self.next_link = None
+
+
+class StorageTaskAssignmentUpdateExecutionContext(_serialization.Model):  # pylint: disable=name-too-long
+    """Execution context of the storage task assignment update.
+
+    :ivar target: Execution target of the storage task assignment.
+    :vartype target: ~azure.mgmt.storage.v2024_01_01.models.ExecutionTarget
+    :ivar trigger: Execution trigger of the storage task assignment.
+    :vartype trigger: ~azure.mgmt.storage.v2024_01_01.models.ExecutionTriggerUpdate
+    """
+
+    _attribute_map = {
+        "target": {"key": "target", "type": "ExecutionTarget"},
+        "trigger": {"key": "trigger", "type": "ExecutionTriggerUpdate"},
+    }
+
+    def __init__(
+        self,
+        *,
+        target: Optional["_models.ExecutionTarget"] = None,
+        trigger: Optional["_models.ExecutionTriggerUpdate"] = None,
+        **kwargs: Any
+    ) -> None:
+        """
+        :keyword target: Execution target of the storage task assignment.
+        :paramtype target: ~azure.mgmt.storage.v2024_01_01.models.ExecutionTarget
+        :keyword trigger: Execution trigger of the storage task assignment.
+        :paramtype trigger: ~azure.mgmt.storage.v2024_01_01.models.ExecutionTriggerUpdate
+        """
+        super().__init__(**kwargs)
+        self.target = target
+        self.trigger = trigger
+
+
+class StorageTaskAssignmentUpdateParameters(_serialization.Model):
+    """Parameters of the storage task assignment update request.
+
+    :ivar properties: Properties of the storage task assignment.
+    :vartype properties:
+     ~azure.mgmt.storage.v2024_01_01.models.StorageTaskAssignmentUpdateProperties
+    """
+
+    _attribute_map = {
+        "properties": {"key": "properties", "type": "StorageTaskAssignmentUpdateProperties"},
+    }
+
+    def __init__(
+        self, *, properties: Optional["_models.StorageTaskAssignmentUpdateProperties"] = None, **kwargs: Any
+    ) -> None:
+        """
+        :keyword properties: Properties of the storage task assignment.
+        :paramtype properties:
+         ~azure.mgmt.storage.v2024_01_01.models.StorageTaskAssignmentUpdateProperties
+        """
+        super().__init__(**kwargs)
+        self.properties = properties
+
+
+class StorageTaskAssignmentUpdateProperties(_serialization.Model):
+    """Properties of the storage task update assignment.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar task_id: Id of the corresponding storage task.
+    :vartype task_id: str
+    :ivar enabled: Whether the storage task assignment is enabled or not.
+    :vartype enabled: bool
+    :ivar description: Text that describes the purpose of the storage task assignment.
+    :vartype description: str
+    :ivar execution_context: The storage task assignment execution context.
+    :vartype execution_context:
+     ~azure.mgmt.storage.v2024_01_01.models.StorageTaskAssignmentUpdateExecutionContext
+    :ivar report: The storage task assignment report.
+    :vartype report: ~azure.mgmt.storage.v2024_01_01.models.StorageTaskAssignmentUpdateReport
+    :ivar provisioning_state: Represents the provisioning state of the storage task assignment.
+     Known values are: "Creating", "ResolvingDNS", "Succeeded", "ValidateSubscriptionQuotaBegin",
+     "ValidateSubscriptionQuotaEnd", "Deleting", "Canceled", and "Failed".
+    :vartype provisioning_state: str or ~azure.mgmt.storage.v2024_01_01.models.ProvisioningState
+    :ivar run_status: Run status of storage task assignment.
+    :vartype run_status: ~azure.mgmt.storage.v2024_01_01.models.StorageTaskReportProperties
+    """
+
+    _validation = {
+        "task_id": {"readonly": True},
+        "provisioning_state": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "task_id": {"key": "taskId", "type": "str"},
+        "enabled": {"key": "enabled", "type": "bool"},
+        "description": {"key": "description", "type": "str"},
+        "execution_context": {"key": "executionContext", "type": "StorageTaskAssignmentUpdateExecutionContext"},
+        "report": {"key": "report", "type": "StorageTaskAssignmentUpdateReport"},
+        "provisioning_state": {"key": "provisioningState", "type": "str"},
+        "run_status": {"key": "runStatus", "type": "StorageTaskReportProperties"},
+    }
+
+    def __init__(
+        self,
+        *,
+        enabled: Optional[bool] = None,
+        description: Optional[str] = None,
+        execution_context: Optional["_models.StorageTaskAssignmentUpdateExecutionContext"] = None,
+        report: Optional["_models.StorageTaskAssignmentUpdateReport"] = None,
+        run_status: Optional["_models.StorageTaskReportProperties"] = None,
+        **kwargs: Any
+    ) -> None:
+        """
+        :keyword enabled: Whether the storage task assignment is enabled or not.
+        :paramtype enabled: bool
+        :keyword description: Text that describes the purpose of the storage task assignment.
+        :paramtype description: str
+        :keyword execution_context: The storage task assignment execution context.
+        :paramtype execution_context:
+         ~azure.mgmt.storage.v2024_01_01.models.StorageTaskAssignmentUpdateExecutionContext
+        :keyword report: The storage task assignment report.
+        :paramtype report: ~azure.mgmt.storage.v2024_01_01.models.StorageTaskAssignmentUpdateReport
+        :keyword run_status: Run status of storage task assignment.
+        :paramtype run_status: ~azure.mgmt.storage.v2024_01_01.models.StorageTaskReportProperties
+        """
+        super().__init__(**kwargs)
+        self.task_id = None
+        self.enabled = enabled
+        self.description = description
+        self.execution_context = execution_context
+        self.report = report
+        self.provisioning_state = None
+        self.run_status = run_status
+
+
+class StorageTaskAssignmentUpdateReport(_serialization.Model):
+    """The storage task assignment report.
+
+    :ivar prefix: The prefix of the storage task assignment report.
+    :vartype prefix: str
+    """
+
+    _attribute_map = {
+        "prefix": {"key": "prefix", "type": "str"},
+    }
+
+    def __init__(self, *, prefix: Optional[str] = None, **kwargs: Any) -> None:
+        """
+        :keyword prefix: The prefix of the storage task assignment report.
+        :paramtype prefix: str
+        """
+        super().__init__(**kwargs)
+        self.prefix = prefix
+
+
+class StorageTaskReportInstance(ProxyResource):
+    """Storage Tasks run report instance.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar id: Fully qualified resource ID for the resource. Ex -
+     /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}.  # pylint: disable=line-too-long
+    :vartype id: str
+    :ivar name: The name of the resource.
+    :vartype name: str
+    :ivar type: The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or
+     "Microsoft.Storage/storageAccounts".
+    :vartype type: str
+    :ivar properties: Storage task execution report for a run instance.
+    :vartype properties: ~azure.mgmt.storage.v2024_01_01.models.StorageTaskReportProperties
+    """
+
+    _validation = {
+        "id": {"readonly": True},
+        "name": {"readonly": True},
+        "type": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "id": {"key": "id", "type": "str"},
+        "name": {"key": "name", "type": "str"},
+        "type": {"key": "type", "type": "str"},
+        "properties": {"key": "properties", "type": "StorageTaskReportProperties"},
+    }
+
+    def __init__(self, *, properties: Optional["_models.StorageTaskReportProperties"] = None, **kwargs: Any) -> None:
+        """
+        :keyword properties: Storage task execution report for a run instance.
+        :paramtype properties: ~azure.mgmt.storage.v2024_01_01.models.StorageTaskReportProperties
+        """
+        super().__init__(**kwargs)
+        self.properties = properties
+
+
+class StorageTaskReportProperties(_serialization.Model):
+    """Storage task execution report for a run instance.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar task_assignment_id: Represents the Storage Task Assignment Id associated with the storage
+     task that provided an execution context.
+    :vartype task_assignment_id: str
+    :ivar storage_account_id: Represents the Storage Account Id where the storage task definition
+     was applied and executed.
+    :vartype storage_account_id: str
+    :ivar start_time: Start time of the run instance. Filter options such as startTime gt
+     '2023-06-26T20:51:24.4494016Z' and other comparison operators can be used as described for
+     DateTime properties in
+     https://learn.microsoft.com/en-us/rest/api/storageservices/querying-tables-and-entities#supported-comparison-operators.  # pylint: disable=line-too-long
+    :vartype start_time: str
+    :ivar finish_time: End time of the run instance. Filter options such as startTime gt
+     '2023-06-26T20:51:24.4494016Z' and other comparison operators can be used as described for
+     DateTime properties in
+     https://learn.microsoft.com/en-us/rest/api/storageservices/querying-tables-and-entities#supported-comparison-operators.  # pylint: disable=line-too-long
+    :vartype finish_time: str
+    :ivar objects_targeted_count: Total number of objects that meet the condition as defined in the
+     storage task assignment execution context. Filter options such as objectsTargetedCount gt 50
+     and other comparison operators can be used as described for Numerical properties in
+     https://learn.microsoft.com/en-us/rest/api/storageservices/querying-tables-and-entities#supported-comparison-operators.  # pylint: disable=line-too-long
+    :vartype objects_targeted_count: str
+    :ivar objects_operated_on_count: Total number of objects that meet the storage tasks condition
+     and were operated upon. Filter options such as objectsOperatedOnCount ge 100 and other
+     comparison operators can be used as described for Numerical properties in
+     https://learn.microsoft.com/en-us/rest/api/storageservices/querying-tables-and-entities#supported-comparison-operators.  # pylint: disable=line-too-long
+    :vartype objects_operated_on_count: str
+    :ivar object_failed_count: Total number of objects where task operation failed when was
+     attempted. Filter options such as objectFailedCount eq 0 and other comparison operators can be
+     used as described for Numerical properties in
+     https://learn.microsoft.com/en-us/rest/api/storageservices/querying-tables-and-entities#supported-comparison-operators.  # pylint: disable=line-too-long
+    :vartype object_failed_count: str
+    :ivar objects_succeeded_count: Total number of objects where task operation succeeded when was
+     attempted.Filter options such as objectsSucceededCount gt 150 and other comparison operators
+     can be used as described for Numerical properties in
+     https://learn.microsoft.com/en-us/rest/api/storageservices/querying-tables-and-entities#supported-comparison-operators.  # pylint: disable=line-too-long
+    :vartype objects_succeeded_count: str
+    :ivar run_status_error: Well known Azure Storage error code that represents the error
+     encountered during execution of the run instance.
+    :vartype run_status_error: str
+    :ivar run_status_enum: Represents the status of the execution. Known values are: "InProgress"
+     and "Finished".
+    :vartype run_status_enum: str or ~azure.mgmt.storage.v2024_01_01.models.RunStatusEnum
+    :ivar summary_report_path: Full path to the verbose report stored in the reporting container as
+     specified in the assignment execution context for the storage account.
+    :vartype summary_report_path: str
+    :ivar task_id: Storage Task Arm Id.
+    :vartype task_id: str
+    :ivar task_version: Storage Task Version.
+    :vartype task_version: str
+    :ivar run_result: Represents the overall result of the execution for the run instance. Known
+     values are: "Succeeded" and "Failed".
+    :vartype run_result: str or ~azure.mgmt.storage.v2024_01_01.models.RunResult
+    """
+
+    _validation = {
+        "task_assignment_id": {"readonly": True},
+        "storage_account_id": {"readonly": True},
+        "start_time": {"readonly": True},
+        "finish_time": {"readonly": True},
+        "objects_targeted_count": {"readonly": True},
+        "objects_operated_on_count": {"readonly": True},
+        "object_failed_count": {"readonly": True},
+        "objects_succeeded_count": {"readonly": True},
+        "run_status_error": {"readonly": True},
+        "run_status_enum": {"readonly": True},
+        "summary_report_path": {"readonly": True},
+        "task_id": {"readonly": True},
+        "task_version": {"readonly": True},
+        "run_result": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "task_assignment_id": {"key": "taskAssignmentId", "type": "str"},
+        "storage_account_id": {"key": "storageAccountId", "type": "str"},
+        "start_time": {"key": "startTime", "type": "str"},
+        "finish_time": {"key": "finishTime", "type": "str"},
+        "objects_targeted_count": {"key": "objectsTargetedCount", "type": "str"},
+        "objects_operated_on_count": {"key": "objectsOperatedOnCount", "type": "str"},
+        "object_failed_count": {"key": "objectFailedCount", "type": "str"},
+        "objects_succeeded_count": {"key": "objectsSucceededCount", "type": "str"},
+        "run_status_error": {"key": "runStatusError", "type": "str"},
+        "run_status_enum": {"key": "runStatusEnum", "type": "str"},
+        "summary_report_path": {"key": "summaryReportPath", "type": "str"},
+        "task_id": {"key": "taskId", "type": "str"},
+        "task_version": {"key": "taskVersion", "type": "str"},
+        "run_result": {"key": "runResult", "type": "str"},
+    }
+
+    def __init__(self, **kwargs: Any) -> None:
+        """ """
+        super().__init__(**kwargs)
+        self.task_assignment_id = None
+        self.storage_account_id = None
+        self.start_time = None
+        self.finish_time = None
+        self.objects_targeted_count = None
+        self.objects_operated_on_count = None
+        self.object_failed_count = None
+        self.objects_succeeded_count = None
+        self.run_status_error = None
+        self.run_status_enum = None
+        self.summary_report_path = None
+        self.task_id = None
+        self.task_version = None
+        self.run_result = None
+
+
+class StorageTaskReportSummary(_serialization.Model):
+    """Fetch Storage Tasks Run Summary.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar value: Gets storage tasks run result summary.
+    :vartype value: list[~azure.mgmt.storage.v2024_01_01.models.StorageTaskReportInstance]
+    :ivar next_link: Request URL that can be used to query next page of storage task run results
+     summary. Returned when the number of run instances and summary reports exceed maximum page
+     size.
+    :vartype next_link: str
+    """
+
+    _validation = {
+        "value": {"readonly": True},
+        "next_link": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "value": {"key": "value", "type": "[StorageTaskReportInstance]"},
+        "next_link": {"key": "nextLink", "type": "str"},
+    }
+
+    def __init__(self, **kwargs: Any) -> None:
+        """ """
+        super().__init__(**kwargs)
+        self.value = None
+        self.next_link = None
+
+
+class SystemData(_serialization.Model):
+    """Metadata pertaining to creation and last modification of the resource.
+
+    :ivar created_by: The identity that created the resource.
+    :vartype created_by: str
+    :ivar created_by_type: The type of identity that created the resource. Known values are:
+     "User", "Application", "ManagedIdentity", and "Key".
+    :vartype created_by_type: str or ~azure.mgmt.storage.v2024_01_01.models.CreatedByType
+    :ivar created_at: The timestamp of resource creation (UTC).
+    :vartype created_at: ~datetime.datetime
+    :ivar last_modified_by: The identity that last modified the resource.
+    :vartype last_modified_by: str
+    :ivar last_modified_by_type: The type of identity that last modified the resource. Known values
+     are: "User", "Application", "ManagedIdentity", and "Key".
+    :vartype last_modified_by_type: str or ~azure.mgmt.storage.v2024_01_01.models.CreatedByType
+    :ivar last_modified_at: The timestamp of resource last modification (UTC).
+    :vartype last_modified_at: ~datetime.datetime
+    """
+
+    _attribute_map = {
+        "created_by": {"key": "createdBy", "type": "str"},
+        "created_by_type": {"key": "createdByType", "type": "str"},
+        "created_at": {"key": "createdAt", "type": "iso-8601"},
+        "last_modified_by": {"key": "lastModifiedBy", "type": "str"},
+        "last_modified_by_type": {"key": "lastModifiedByType", "type": "str"},
+        "last_modified_at": {"key": "lastModifiedAt", "type": "iso-8601"},
+    }
+
+    def __init__(
+        self,
+        *,
+        created_by: Optional[str] = None,
+        created_by_type: Optional[Union[str, "_models.CreatedByType"]] = None,
+        created_at: Optional[datetime.datetime] = None,
+        last_modified_by: Optional[str] = None,
+        last_modified_by_type: Optional[Union[str, "_models.CreatedByType"]] = None,
+        last_modified_at: Optional[datetime.datetime] = None,
+        **kwargs: Any
+    ) -> None:
+        """
+        :keyword created_by: The identity that created the resource.
+        :paramtype created_by: str
+        :keyword created_by_type: The type of identity that created the resource. Known values are:
+         "User", "Application", "ManagedIdentity", and "Key".
+        :paramtype created_by_type: str or ~azure.mgmt.storage.v2024_01_01.models.CreatedByType
+        :keyword created_at: The timestamp of resource creation (UTC).
+        :paramtype created_at: ~datetime.datetime
+        :keyword last_modified_by: The identity that last modified the resource.
+        :paramtype last_modified_by: str
+        :keyword last_modified_by_type: The type of identity that last modified the resource. Known
+         values are: "User", "Application", "ManagedIdentity", and "Key".
+        :paramtype last_modified_by_type: str or ~azure.mgmt.storage.v2024_01_01.models.CreatedByType
+        :keyword last_modified_at: The timestamp of resource last modification (UTC).
+        :paramtype last_modified_at: ~datetime.datetime
+        """
+        super().__init__(**kwargs)
+        self.created_by = created_by
+        self.created_by_type = created_by_type
+        self.created_at = created_at
+        self.last_modified_by = last_modified_by
+        self.last_modified_by_type = last_modified_by_type
+        self.last_modified_at = last_modified_at
+
+
+class Table(Resource):
+    """Properties of the table, including Id, resource name, resource type.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar id: Fully qualified resource ID for the resource. Ex -
+     /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}.  # pylint: disable=line-too-long
+    :vartype id: str
+    :ivar name: The name of the resource.
+    :vartype name: str
+    :ivar type: The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or
+     "Microsoft.Storage/storageAccounts".
+    :vartype type: str
+    :ivar table_name: Table name under the specified account.
+    :vartype table_name: str
+    :ivar signed_identifiers: List of stored access policies specified on the table.
+    :vartype signed_identifiers: list[~azure.mgmt.storage.v2024_01_01.models.TableSignedIdentifier]
+    """
+
+    _validation = {
+        "id": {"readonly": True},
+        "name": {"readonly": True},
+        "type": {"readonly": True},
+        "table_name": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "id": {"key": "id", "type": "str"},
+        "name": {"key": "name", "type": "str"},
+        "type": {"key": "type", "type": "str"},
+        "table_name": {"key": "properties.tableName", "type": "str"},
+        "signed_identifiers": {"key": "properties.signedIdentifiers", "type": "[TableSignedIdentifier]"},
+    }
+
+    def __init__(
+        self, *, signed_identifiers: Optional[List["_models.TableSignedIdentifier"]] = None, **kwargs: Any
+    ) -> None:
+        """
+        :keyword signed_identifiers: List of stored access policies specified on the table.
+        :paramtype signed_identifiers:
+         list[~azure.mgmt.storage.v2024_01_01.models.TableSignedIdentifier]
+        """
+        super().__init__(**kwargs)
+        self.table_name = None
+        self.signed_identifiers = signed_identifiers
+
+
+class TableAccessPolicy(_serialization.Model):
+    """Table Access Policy Properties Object.
+
+    All required parameters must be populated in order to send to server.
+
+    :ivar start_time: Start time of the access policy.
+    :vartype start_time: ~datetime.datetime
+    :ivar expiry_time: Expiry time of the access policy.
+    :vartype expiry_time: ~datetime.datetime
+    :ivar permission: Required. List of abbreviated permissions. Supported permission values
+     include 'r','a','u','d'. Required.
+    :vartype permission: str
+    """
+
+    _validation = {
+        "permission": {"required": True},
+    }
+
+    _attribute_map = {
+        "start_time": {"key": "startTime", "type": "iso-8601"},
+        "expiry_time": {"key": "expiryTime", "type": "iso-8601"},
+        "permission": {"key": "permission", "type": "str"},
+    }
+
+    def __init__(
+        self,
+        *,
+        permission: str,
+        start_time: Optional[datetime.datetime] = None,
+        expiry_time: Optional[datetime.datetime] = None,
+        **kwargs: Any
+    ) -> None:
+        """
+        :keyword start_time: Start time of the access policy.
+        :paramtype start_time: ~datetime.datetime
+        :keyword expiry_time: Expiry time of the access policy.
+        :paramtype expiry_time: ~datetime.datetime
+        :keyword permission: Required. List of abbreviated permissions. Supported permission values
+         include 'r','a','u','d'. Required.
+        :paramtype permission: str
+        """
+        super().__init__(**kwargs)
+        self.start_time = start_time
+        self.expiry_time = expiry_time
+        self.permission = permission
+
+
+class TableServiceProperties(Resource):
+    """The properties of a storage account’s Table service.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar id: Fully qualified resource ID for the resource. Ex -
+     /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}.  # pylint: disable=line-too-long
+    :vartype id: str
+    :ivar name: The name of the resource.
+    :vartype name: str
+    :ivar type: The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or
+     "Microsoft.Storage/storageAccounts".
+    :vartype type: str
+    :ivar cors: Specifies CORS rules for the Table service. You can include up to five CorsRule
+     elements in the request. If no CorsRule elements are included in the request body, all CORS
+     rules will be deleted, and CORS will be disabled for the Table service.
+    :vartype cors: ~azure.mgmt.storage.v2024_01_01.models.CorsRules
+    """
+
+    _validation = {
+        "id": {"readonly": True},
+        "name": {"readonly": True},
+        "type": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "id": {"key": "id", "type": "str"},
+        "name": {"key": "name", "type": "str"},
+        "type": {"key": "type", "type": "str"},
+        "cors": {"key": "properties.cors", "type": "CorsRules"},
+    }
+
+    def __init__(self, *, cors: Optional["_models.CorsRules"] = None, **kwargs: Any) -> None:
+        """
+        :keyword cors: Specifies CORS rules for the Table service. You can include up to five CorsRule
+         elements in the request. If no CorsRule elements are included in the request body, all CORS
+         rules will be deleted, and CORS will be disabled for the Table service.
+        :paramtype cors: ~azure.mgmt.storage.v2024_01_01.models.CorsRules
+        """
+        super().__init__(**kwargs)
+        self.cors = cors
+
+
+class TableSignedIdentifier(_serialization.Model):
+    """Object to set Table Access Policy.
+
+    All required parameters must be populated in order to send to server.
+
+    :ivar id: unique-64-character-value of the stored access policy. Required.
+    :vartype id: str
+    :ivar access_policy: Access policy.
+    :vartype access_policy: ~azure.mgmt.storage.v2024_01_01.models.TableAccessPolicy
+    """
+
+    _validation = {
+        "id": {"required": True},
+    }
+
+    _attribute_map = {
+        "id": {"key": "id", "type": "str"},
+        "access_policy": {"key": "accessPolicy", "type": "TableAccessPolicy"},
+    }
+
+    def __init__(
+        self,
+        *,
+        id: str,  # pylint: disable=redefined-builtin
+        access_policy: Optional["_models.TableAccessPolicy"] = None,
+        **kwargs: Any
+    ) -> None:
+        """
+        :keyword id: unique-64-character-value of the stored access policy. Required.
+        :paramtype id: str
+        :keyword access_policy: Access policy.
+        :paramtype access_policy: ~azure.mgmt.storage.v2024_01_01.models.TableAccessPolicy
+        """
+        super().__init__(**kwargs)
+        self.id = id
+        self.access_policy = access_policy
+
+
+class TagFilter(_serialization.Model):
+    """Blob index tag based filtering for blob objects.
+
+    All required parameters must be populated in order to send to server.
+
+    :ivar name: This is the filter tag name, it can have 1 - 128 characters. Required.
+    :vartype name: str
+    :ivar op: This is the comparison operator which is used for object comparison and filtering.
+     Only == (equality operator) is currently supported. Required.
+    :vartype op: str
+    :ivar value: This is the filter tag value field used for tag based filtering, it can have 0 -
+     256 characters. Required.
+    :vartype value: str
+    """
+
+    _validation = {
+        "name": {"required": True, "max_length": 128, "min_length": 1},
+        "op": {"required": True},
+        "value": {"required": True, "max_length": 256},
+    }
+
+    _attribute_map = {
+        "name": {"key": "name", "type": "str"},
+        "op": {"key": "op", "type": "str"},
+        "value": {"key": "value", "type": "str"},
+    }
+
+    def __init__(self, *, name: str, op: str, value: str, **kwargs: Any) -> None:
+        """
+        :keyword name: This is the filter tag name, it can have 1 - 128 characters. Required.
+        :paramtype name: str
+        :keyword op: This is the comparison operator which is used for object comparison and filtering.
+         Only == (equality operator) is currently supported. Required.
+        :paramtype op: str
+        :keyword value: This is the filter tag value field used for tag based filtering, it can have 0
+         - 256 characters. Required.
+        :paramtype value: str
+        """
+        super().__init__(**kwargs)
+        self.name = name
+        self.op = op
+        self.value = value
+
+
+class TagProperty(_serialization.Model):
+    """A tag of the LegalHold of a blob container.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar tag: The tag value.
+    :vartype tag: str
+    :ivar timestamp: Returns the date and time the tag was added.
+    :vartype timestamp: ~datetime.datetime
+    :ivar object_identifier: Returns the Object ID of the user who added the tag.
+    :vartype object_identifier: str
+    :ivar tenant_id: Returns the Tenant ID that issued the token for the user who added the tag.
+    :vartype tenant_id: str
+    :ivar upn: Returns the User Principal Name of the user who added the tag.
+    :vartype upn: str
+    """
+
+    _validation = {
+        "tag": {"readonly": True},
+        "timestamp": {"readonly": True},
+        "object_identifier": {"readonly": True},
+        "tenant_id": {"readonly": True},
+        "upn": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "tag": {"key": "tag", "type": "str"},
+        "timestamp": {"key": "timestamp", "type": "iso-8601"},
+        "object_identifier": {"key": "objectIdentifier", "type": "str"},
+        "tenant_id": {"key": "tenantId", "type": "str"},
+        "upn": {"key": "upn", "type": "str"},
+    }
+
+    def __init__(self, **kwargs: Any) -> None:
+        """ """
+        super().__init__(**kwargs)
+        self.tag = None
+        self.timestamp = None
+        self.object_identifier = None
+        self.tenant_id = None
+        self.upn = None
+
+
+class TriggerParameters(_serialization.Model):
+    """The trigger parameters update for the storage task assignment execution.
+
+    :ivar start_from: When to start task execution. This is a required field when
+     ExecutionTrigger.properties.type is 'OnSchedule'; this property should not be present when
+     ExecutionTrigger.properties.type is 'RunOnce'.
+    :vartype start_from: ~datetime.datetime
+    :ivar interval: Run interval of task execution. This is a required field when
+     ExecutionTrigger.properties.type is 'OnSchedule'; this property should not be present when
+     ExecutionTrigger.properties.type is 'RunOnce'.
+    :vartype interval: int
+    :ivar interval_unit: Run interval unit of task execution. This is a required field when
+     ExecutionTrigger.properties.type is 'OnSchedule'; this property should not be present when
+     ExecutionTrigger.properties.type is 'RunOnce'. Default value is "Days".
+    :vartype interval_unit: str
+    :ivar end_by: When to end task execution. This is a required field when
+     ExecutionTrigger.properties.type is 'OnSchedule'; this property should not be present when
+     ExecutionTrigger.properties.type is 'RunOnce'.
+    :vartype end_by: ~datetime.datetime
+    :ivar start_on: When to start task execution. This is an optional field when
+     ExecutionTrigger.properties.type is 'RunOnce'; this property should not be present when
+     ExecutionTrigger.properties.type is 'OnSchedule'.
+    :vartype start_on: ~datetime.datetime
+    """
+
+    _validation = {
+        "interval": {"minimum": 1},
+    }
+
+    _attribute_map = {
+        "start_from": {"key": "startFrom", "type": "iso-8601"},
+        "interval": {"key": "interval", "type": "int"},
+        "interval_unit": {"key": "intervalUnit", "type": "str"},
+        "end_by": {"key": "endBy", "type": "iso-8601"},
+        "start_on": {"key": "startOn", "type": "iso-8601"},
+    }
+
+    def __init__(
+        self,
+        *,
+        start_from: Optional[datetime.datetime] = None,
+        interval: Optional[int] = None,
+        interval_unit: Optional[Literal["Days"]] = None,
+        end_by: Optional[datetime.datetime] = None,
+        start_on: Optional[datetime.datetime] = None,
+        **kwargs: Any
+    ) -> None:
+        """
+        :keyword start_from: When to start task execution. This is a required field when
+         ExecutionTrigger.properties.type is 'OnSchedule'; this property should not be present when
+         ExecutionTrigger.properties.type is 'RunOnce'.
+        :paramtype start_from: ~datetime.datetime
+        :keyword interval: Run interval of task execution. This is a required field when
+         ExecutionTrigger.properties.type is 'OnSchedule'; this property should not be present when
+         ExecutionTrigger.properties.type is 'RunOnce'.
+        :paramtype interval: int
+        :keyword interval_unit: Run interval unit of task execution. This is a required field when
+         ExecutionTrigger.properties.type is 'OnSchedule'; this property should not be present when
+         ExecutionTrigger.properties.type is 'RunOnce'. Default value is "Days".
+        :paramtype interval_unit: str
+        :keyword end_by: When to end task execution. This is a required field when
+         ExecutionTrigger.properties.type is 'OnSchedule'; this property should not be present when
+         ExecutionTrigger.properties.type is 'RunOnce'.
+        :paramtype end_by: ~datetime.datetime
+        :keyword start_on: When to start task execution. This is an optional field when
+         ExecutionTrigger.properties.type is 'RunOnce'; this property should not be present when
+         ExecutionTrigger.properties.type is 'OnSchedule'.
+        :paramtype start_on: ~datetime.datetime
+        """
+        super().__init__(**kwargs)
+        self.start_from = start_from
+        self.interval = interval
+        self.interval_unit = interval_unit
+        self.end_by = end_by
+        self.start_on = start_on
+
+
+class TriggerParametersUpdate(_serialization.Model):
+    """The trigger parameters update for the storage task assignment execution.
+
+    :ivar start_from: When to start task execution. This is a mutable field when
+     ExecutionTrigger.properties.type is 'OnSchedule'; this property should not be present when
+     ExecutionTrigger.properties.type is 'RunOnce'.
+    :vartype start_from: ~datetime.datetime
+    :ivar interval: Run interval of task execution. This is a mutable field when
+     ExecutionTrigger.properties.type is 'OnSchedule'; this property should not be present when
+     ExecutionTrigger.properties.type is 'RunOnce'.
+    :vartype interval: int
+    :ivar interval_unit: Run interval unit of task execution. This is a mutable field when
+     ExecutionTrigger.properties.type is 'OnSchedule'; this property should not be present when
+     ExecutionTrigger.properties.type is 'RunOnce'. Default value is "Days".
+    :vartype interval_unit: str
+    :ivar end_by: When to end task execution. This is a mutable field when
+     ExecutionTrigger.properties.type is 'OnSchedule'; this property should not be present when
+     ExecutionTrigger.properties.type is 'RunOnce'.
+    :vartype end_by: ~datetime.datetime
+    :ivar start_on: When to start task execution. This is a mutable field when
+     ExecutionTrigger.properties.type is 'RunOnce'; this property should not be present when
+     ExecutionTrigger.properties.type is 'OnSchedule'.
+    :vartype start_on: ~datetime.datetime
+    """
+
+    _validation = {
+        "interval": {"minimum": 1},
+    }
+
+    _attribute_map = {
+        "start_from": {"key": "startFrom", "type": "iso-8601"},
+        "interval": {"key": "interval", "type": "int"},
+        "interval_unit": {"key": "intervalUnit", "type": "str"},
+        "end_by": {"key": "endBy", "type": "iso-8601"},
+        "start_on": {"key": "startOn", "type": "iso-8601"},
+    }
+
+    def __init__(
+        self,
+        *,
+        start_from: Optional[datetime.datetime] = None,
+        interval: Optional[int] = None,
+        interval_unit: Optional[Literal["Days"]] = None,
+        end_by: Optional[datetime.datetime] = None,
+        start_on: Optional[datetime.datetime] = None,
+        **kwargs: Any
+    ) -> None:
+        """
+        :keyword start_from: When to start task execution. This is a mutable field when
+         ExecutionTrigger.properties.type is 'OnSchedule'; this property should not be present when
+         ExecutionTrigger.properties.type is 'RunOnce'.
+        :paramtype start_from: ~datetime.datetime
+        :keyword interval: Run interval of task execution. This is a mutable field when
+         ExecutionTrigger.properties.type is 'OnSchedule'; this property should not be present when
+         ExecutionTrigger.properties.type is 'RunOnce'.
+        :paramtype interval: int
+        :keyword interval_unit: Run interval unit of task execution. This is a mutable field when
+         ExecutionTrigger.properties.type is 'OnSchedule'; this property should not be present when
+         ExecutionTrigger.properties.type is 'RunOnce'. Default value is "Days".
+        :paramtype interval_unit: str
+        :keyword end_by: When to end task execution. This is a mutable field when
+         ExecutionTrigger.properties.type is 'OnSchedule'; this property should not be present when
+         ExecutionTrigger.properties.type is 'RunOnce'.
+        :paramtype end_by: ~datetime.datetime
+        :keyword start_on: When to start task execution. This is a mutable field when
+         ExecutionTrigger.properties.type is 'RunOnce'; this property should not be present when
+         ExecutionTrigger.properties.type is 'OnSchedule'.
+        :paramtype start_on: ~datetime.datetime
+        """
+        super().__init__(**kwargs)
+        self.start_from = start_from
+        self.interval = interval
+        self.interval_unit = interval_unit
+        self.end_by = end_by
+        self.start_on = start_on
+
+
+class UpdateHistoryProperty(_serialization.Model):
+    """An update history of the ImmutabilityPolicy of a blob container.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar update: The ImmutabilityPolicy update type of a blob container, possible values include:
+     put, lock and extend. Known values are: "put", "lock", and "extend".
+    :vartype update: str or ~azure.mgmt.storage.v2024_01_01.models.ImmutabilityPolicyUpdateType
+    :ivar immutability_period_since_creation_in_days: The immutability period for the blobs in the
+     container since the policy creation, in days.
+    :vartype immutability_period_since_creation_in_days: int
+    :ivar timestamp: Returns the date and time the ImmutabilityPolicy was updated.
+    :vartype timestamp: ~datetime.datetime
+    :ivar object_identifier: Returns the Object ID of the user who updated the ImmutabilityPolicy.
+    :vartype object_identifier: str
+    :ivar tenant_id: Returns the Tenant ID that issued the token for the user who updated the
+     ImmutabilityPolicy.
+    :vartype tenant_id: str
+    :ivar upn: Returns the User Principal Name of the user who updated the ImmutabilityPolicy.
+    :vartype upn: str
+    :ivar allow_protected_append_writes: This property can only be changed for unlocked time-based
+     retention policies. When enabled, new blocks can be written to an append blob while maintaining
+     immutability protection and compliance. Only new blocks can be added and any existing blocks
+     cannot be modified or deleted. This property cannot be changed with ExtendImmutabilityPolicy
+     API.
+    :vartype allow_protected_append_writes: bool
+    :ivar allow_protected_append_writes_all: This property can only be changed for unlocked
+     time-based retention policies. When enabled, new blocks can be written to both 'Append and Bock
+     Blobs' while maintaining immutability protection and compliance. Only new blocks can be added
+     and any existing blocks cannot be modified or deleted. This property cannot be changed with
+     ExtendImmutabilityPolicy API. The 'allowProtectedAppendWrites' and
+     'allowProtectedAppendWritesAll' properties are mutually exclusive.
+    :vartype allow_protected_append_writes_all: bool
+    """
+
+    _validation = {
+        "update": {"readonly": True},
+        "immutability_period_since_creation_in_days": {"readonly": True},
+        "timestamp": {"readonly": True},
+        "object_identifier": {"readonly": True},
+        "tenant_id": {"readonly": True},
+        "upn": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "update": {"key": "update", "type": "str"},
+        "immutability_period_since_creation_in_days": {"key": "immutabilityPeriodSinceCreationInDays", "type": "int"},
+        "timestamp": {"key": "timestamp", "type": "iso-8601"},
+        "object_identifier": {"key": "objectIdentifier", "type": "str"},
+        "tenant_id": {"key": "tenantId", "type": "str"},
+        "upn": {"key": "upn", "type": "str"},
+        "allow_protected_append_writes": {"key": "allowProtectedAppendWrites", "type": "bool"},
+        "allow_protected_append_writes_all": {"key": "allowProtectedAppendWritesAll", "type": "bool"},
+    }
+
+    def __init__(
+        self,
+        *,
+        allow_protected_append_writes: Optional[bool] = None,
+        allow_protected_append_writes_all: Optional[bool] = None,
+        **kwargs: Any
+    ) -> None:
+        """
+        :keyword allow_protected_append_writes: This property can only be changed for unlocked
+         time-based retention policies. When enabled, new blocks can be written to an append blob while
+         maintaining immutability protection and compliance. Only new blocks can be added and any
+         existing blocks cannot be modified or deleted. This property cannot be changed with
+         ExtendImmutabilityPolicy API.
+        :paramtype allow_protected_append_writes: bool
+        :keyword allow_protected_append_writes_all: This property can only be changed for unlocked
+         time-based retention policies. When enabled, new blocks can be written to both 'Append and Bock
+         Blobs' while maintaining immutability protection and compliance. Only new blocks can be added
+         and any existing blocks cannot be modified or deleted. This property cannot be changed with
+         ExtendImmutabilityPolicy API. The 'allowProtectedAppendWrites' and
+         'allowProtectedAppendWritesAll' properties are mutually exclusive.
+        :paramtype allow_protected_append_writes_all: bool
+        """
+        super().__init__(**kwargs)
+        self.update = None
+        self.immutability_period_since_creation_in_days = None
+        self.timestamp = None
+        self.object_identifier = None
+        self.tenant_id = None
+        self.upn = None
+        self.allow_protected_append_writes = allow_protected_append_writes
+        self.allow_protected_append_writes_all = allow_protected_append_writes_all
+
+
+class Usage(_serialization.Model):
+    """Describes Storage Resource Usage.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar unit: Gets the unit of measurement. Known values are: "Count", "Bytes", "Seconds",
+     "Percent", "CountsPerSecond", and "BytesPerSecond".
+    :vartype unit: str or ~azure.mgmt.storage.v2024_01_01.models.UsageUnit
+    :ivar current_value: Gets the current count of the allocated resources in the subscription.
+    :vartype current_value: int
+    :ivar limit: Gets the maximum count of the resources that can be allocated in the subscription.
+    :vartype limit: int
+    :ivar name: Gets the name of the type of usage.
+    :vartype name: ~azure.mgmt.storage.v2024_01_01.models.UsageName
+    """
+
+    _validation = {
+        "unit": {"readonly": True},
+        "current_value": {"readonly": True},
+        "limit": {"readonly": True},
+        "name": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "unit": {"key": "unit", "type": "str"},
+        "current_value": {"key": "currentValue", "type": "int"},
+        "limit": {"key": "limit", "type": "int"},
+        "name": {"key": "name", "type": "UsageName"},
+    }
+
+    def __init__(self, **kwargs: Any) -> None:
+        """ """
+        super().__init__(**kwargs)
+        self.unit = None
+        self.current_value = None
+        self.limit = None
+        self.name = None
+
+
+class UsageListResult(_serialization.Model):
+    """The response from the List Usages operation.
+
+    :ivar value: Gets or sets the list of Storage Resource Usages.
+    :vartype value: list[~azure.mgmt.storage.v2024_01_01.models.Usage]
+    """
+
+    _attribute_map = {
+        "value": {"key": "value", "type": "[Usage]"},
+    }
+
+    def __init__(self, *, value: Optional[List["_models.Usage"]] = None, **kwargs: Any) -> None:
+        """
+        :keyword value: Gets or sets the list of Storage Resource Usages.
+        :paramtype value: list[~azure.mgmt.storage.v2024_01_01.models.Usage]
+        """
+        super().__init__(**kwargs)
+        self.value = value
+
+
+class UsageName(_serialization.Model):
+    """The usage names that can be used; currently limited to StorageAccount.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar value: Gets a string describing the resource name.
+    :vartype value: str
+    :ivar localized_value: Gets a localized string describing the resource name.
+    :vartype localized_value: str
+    """
+
+    _validation = {
+        "value": {"readonly": True},
+        "localized_value": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "value": {"key": "value", "type": "str"},
+        "localized_value": {"key": "localizedValue", "type": "str"},
+    }
+
+    def __init__(self, **kwargs: Any) -> None:
+        """ """
+        super().__init__(**kwargs)
+        self.value = None
+        self.localized_value = None
+
+
+class UserAssignedIdentity(_serialization.Model):
+    """UserAssignedIdentity for the resource.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar principal_id: The principal ID of the identity.
+    :vartype principal_id: str
+    :ivar client_id: The client ID of the identity.
+    :vartype client_id: str
+    """
+
+    _validation = {
+        "principal_id": {"readonly": True},
+        "client_id": {"readonly": True},
+    }
+
+    _attribute_map = {
+        "principal_id": {"key": "principalId", "type": "str"},
+        "client_id": {"key": "clientId", "type": "str"},
+    }
+
+    def __init__(self, **kwargs: Any) -> None:
+        """ """
+        super().__init__(**kwargs)
+        self.principal_id = None
+        self.client_id = None
+
+
+class VirtualNetworkRule(_serialization.Model):
+    """Virtual Network rule.
+
+    All required parameters must be populated in order to send to server.
+
+    :ivar virtual_network_resource_id: Resource ID of a subnet, for example:
+     /subscriptions/{subscriptionId}/resourceGroups/{groupName}/providers/Microsoft.Network/virtualNetworks/{vnetName}/subnets/{subnetName}.  # pylint: disable=line-too-long
+     Required.
+    :vartype virtual_network_resource_id: str
+    :ivar action: The action of virtual network rule. Default value is "Allow".
+    :vartype action: str
+    :ivar state: Gets the state of virtual network rule. Known values are: "Provisioning",
+     "Deprovisioning", "Succeeded", "Failed", and "NetworkSourceDeleted".
+    :vartype state: str or ~azure.mgmt.storage.v2024_01_01.models.State
+    """
+
+    _validation = {
+        "virtual_network_resource_id": {"required": True},
+    }
+
+    _attribute_map = {
+        "virtual_network_resource_id": {"key": "id", "type": "str"},
+        "action": {"key": "action", "type": "str"},
+        "state": {"key": "state", "type": "str"},
+    }
+
+    def __init__(
+        self,
+        *,
+        virtual_network_resource_id: str,
+        action: Optional[Literal["Allow"]] = None,
+        state: Optional[Union[str, "_models.State"]] = None,
+        **kwargs: Any
+    ) -> None:
+        """
+        :keyword virtual_network_resource_id: Resource ID of a subnet, for example:
+         /subscriptions/{subscriptionId}/resourceGroups/{groupName}/providers/Microsoft.Network/virtualNetworks/{vnetName}/subnets/{subnetName}.  # pylint: disable=line-too-long
+         Required.
+        :paramtype virtual_network_resource_id: str
+        :keyword action: The action of virtual network rule. Default value is "Allow".
+        :paramtype action: str
+        :keyword state: Gets the state of virtual network rule. Known values are: "Provisioning",
+         "Deprovisioning", "Succeeded", "Failed", and "NetworkSourceDeleted".
+        :paramtype state: str or ~azure.mgmt.storage.v2024_01_01.models.State
+        """
+        super().__init__(**kwargs)
+        self.virtual_network_resource_id = virtual_network_resource_id
+        self.action = action
+        self.state = state
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/models/_patch.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/models/_patch.py
new file mode 100644
index 000000000000..f7dd32510333
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/models/_patch.py
@@ -0,0 +1,20 @@
+# ------------------------------------
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+# ------------------------------------
+"""Customize generated code here.
+
+Follow our quickstart for examples: https://aka.ms/azsdk/python/dpcodegen/python/customize
+"""
+from typing import List
+
+__all__: List[str] = []  # Add all objects you want publicly available to users at this package level
+
+
+def patch_sdk():
+    """Do not remove from this file.
+
+    `patch_sdk` is a last resort escape hatch that allows you to do customizations
+    you can't accomplish using the techniques described in
+    https://aka.ms/azsdk/python/dpcodegen/python/customize
+    """
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/models/_storage_management_client_enums.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/models/_storage_management_client_enums.py
new file mode 100644
index 000000000000..b5e4ec197e70
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/models/_storage_management_client_enums.py
@@ -0,0 +1,714 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+
+from enum import Enum
+from azure.core import CaseInsensitiveEnumMeta
+
+
+class AccessTier(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+    """Required for storage accounts where kind = BlobStorage. The access tier is used for billing.
+    The 'Premium' access tier is the default value for premium block blobs storage account type and
+    it cannot be changed for the premium block blobs storage account type.
+    """
+
+    HOT = "Hot"
+    COOL = "Cool"
+    PREMIUM = "Premium"
+    COLD = "Cold"
+
+
+class AccountImmutabilityPolicyState(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+    """The ImmutabilityPolicy state defines the mode of the policy. Disabled state disables the
+    policy, Unlocked state allows increase and decrease of immutability retention time and also
+    allows toggling allowProtectedAppendWrites property, Locked state only allows the increase of
+    the immutability retention time. A policy can only be created in a Disabled or Unlocked state
+    and can be toggled between the two states. Only a policy in an Unlocked state can transition to
+    a Locked state which cannot be reverted.
+    """
+
+    UNLOCKED = "Unlocked"
+    LOCKED = "Locked"
+    DISABLED = "Disabled"
+
+
+class AccountStatus(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+    """Gets the status indicating whether the primary location of the storage account is available or
+    unavailable.
+    """
+
+    AVAILABLE = "available"
+    UNAVAILABLE = "unavailable"
+
+
+class AccountType(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+    """Specifies the Active Directory account type for Azure Storage."""
+
+    USER = "User"
+    COMPUTER = "Computer"
+
+
+class AllowedCopyScope(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+    """Restrict copy to and from Storage Accounts within an AAD tenant or with Private Links to the
+    same VNet.
+    """
+
+    PRIVATE_LINK = "PrivateLink"
+    AAD = "AAD"
+
+
+class AllowedMethods(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+    """AllowedMethods."""
+
+    DELETE = "DELETE"
+    GET = "GET"
+    HEAD = "HEAD"
+    MERGE = "MERGE"
+    POST = "POST"
+    OPTIONS = "OPTIONS"
+    PUT = "PUT"
+    PATCH = "PATCH"
+    CONNECT = "CONNECT"
+    TRACE = "TRACE"
+
+
+class BlobInventoryPolicyName(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+    """BlobInventoryPolicyName."""
+
+    DEFAULT = "default"
+
+
+class BlobRestoreProgressStatus(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+    """The status of blob restore progress. Possible values are: - InProgress: Indicates that blob
+    restore is ongoing. - Complete: Indicates that blob restore has been completed successfully. -
+    Failed: Indicates that blob restore is failed.
+    """
+
+    IN_PROGRESS = "InProgress"
+    COMPLETE = "Complete"
+    FAILED = "Failed"
+
+
+class Bypass(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+    """Specifies whether traffic is bypassed for Logging/Metrics/AzureServices. Possible values are
+    any combination of Logging|Metrics|AzureServices (For example, "Logging, Metrics"), or None to
+    bypass none of those traffics.
+    """
+
+    NONE = "None"
+    LOGGING = "Logging"
+    METRICS = "Metrics"
+    AZURE_SERVICES = "AzureServices"
+
+
+class CreatedByType(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+    """The type of identity that created the resource."""
+
+    USER = "User"
+    APPLICATION = "Application"
+    MANAGED_IDENTITY = "ManagedIdentity"
+    KEY = "Key"
+
+
+class DefaultAction(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+    """Specifies the default action of allow or deny when no other rules match."""
+
+    ALLOW = "Allow"
+    DENY = "Deny"
+
+
+class DefaultSharePermission(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+    """Default share permission for users using Kerberos authentication if RBAC role is not assigned."""
+
+    NONE = "None"
+    STORAGE_FILE_DATA_SMB_SHARE_READER = "StorageFileDataSmbShareReader"
+    STORAGE_FILE_DATA_SMB_SHARE_CONTRIBUTOR = "StorageFileDataSmbShareContributor"
+    STORAGE_FILE_DATA_SMB_SHARE_ELEVATED_CONTRIBUTOR = "StorageFileDataSmbShareElevatedContributor"
+
+
+class DirectoryServiceOptions(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+    """Indicates the directory service used. Note that this enum may be extended in the future."""
+
+    NONE = "None"
+    AADDS = "AADDS"
+    AD = "AD"
+    AADKERB = "AADKERB"
+
+
+class DnsEndpointType(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+    """Allows you to specify the type of endpoint. Set this to AzureDNSZone to create a large number
+    of accounts in a single subscription, which creates accounts in an Azure DNS Zone and the
+    endpoint URL will have an alphanumeric DNS Zone identifier.
+    """
+
+    STANDARD = "Standard"
+    AZURE_DNS_ZONE = "AzureDnsZone"
+
+
+class EnabledProtocols(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+    """The authentication protocol that is used for the file share. Can only be specified when
+    creating a share.
+    """
+
+    SMB = "SMB"
+    NFS = "NFS"
+
+
+class EncryptionScopeSource(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+    """The provider for the encryption scope. Possible values (case-insensitive):  Microsoft.Storage,
+    Microsoft.KeyVault.
+    """
+
+    MICROSOFT_STORAGE = "Microsoft.Storage"
+    MICROSOFT_KEY_VAULT = "Microsoft.KeyVault"
+
+
+class EncryptionScopeState(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+    """The state of the encryption scope. Possible values (case-insensitive):  Enabled, Disabled."""
+
+    ENABLED = "Enabled"
+    DISABLED = "Disabled"
+
+
+class ExpirationAction(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+    """The SAS Expiration Action defines the action to be performed when sasPolicy.sasExpirationPeriod
+    is violated. The 'Log' action can be used for audit purposes and the 'Block' action can be used
+    to block and deny the usage of SAS tokens that do not adhere to the sas policy expiration
+    period.
+    """
+
+    LOG = "Log"
+    BLOCK = "Block"
+
+
+class ExtendedLocationTypes(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+    """The type of extendedLocation."""
+
+    EDGE_ZONE = "EdgeZone"
+
+
+class Format(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+    """This is a required field, it specifies the format for the inventory files."""
+
+    CSV = "Csv"
+    PARQUET = "Parquet"
+
+
+class GeoReplicationStatus(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+    """The status of the secondary location. Possible values are: - Live: Indicates that the secondary
+    location is active and operational. - Bootstrap: Indicates initial synchronization from the
+    primary location to the secondary location is in progress.This typically occurs when
+    replication is first enabled. - Unavailable: Indicates that the secondary location is
+    temporarily unavailable.
+    """
+
+    LIVE = "Live"
+    BOOTSTRAP = "Bootstrap"
+    UNAVAILABLE = "Unavailable"
+
+
+class HttpProtocol(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+    """The protocol permitted for a request made with the account SAS."""
+
+    HTTPS_HTTP = "https,http"
+    HTTPS = "https"
+
+
+class IdentityType(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+    """The identity type."""
+
+    NONE = "None"
+    SYSTEM_ASSIGNED = "SystemAssigned"
+    USER_ASSIGNED = "UserAssigned"
+    SYSTEM_ASSIGNED_USER_ASSIGNED = "SystemAssigned,UserAssigned"
+
+
+class ImmutabilityPolicyState(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+    """The ImmutabilityPolicy state of a blob container, possible values include: Locked and Unlocked."""
+
+    LOCKED = "Locked"
+    UNLOCKED = "Unlocked"
+
+
+class ImmutabilityPolicyUpdateType(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+    """The ImmutabilityPolicy update type of a blob container, possible values include: put, lock and
+    extend.
+    """
+
+    PUT = "put"
+    LOCK = "lock"
+    EXTEND = "extend"
+
+
+class InventoryRuleType(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+    """The valid value is Inventory."""
+
+    INVENTORY = "Inventory"
+
+
+class IssueType(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+    """Type of issue."""
+
+    UNKNOWN = "Unknown"
+    CONFIGURATION_PROPAGATION_FAILURE = "ConfigurationPropagationFailure"
+
+
+class KeyPermission(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+    """Permissions for the key -- read-only or full permissions."""
+
+    READ = "Read"
+    FULL = "Full"
+
+
+class KeySource(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+    """The encryption keySource (provider). Possible values (case-insensitive):  Microsoft.Storage,
+    Microsoft.Keyvault.
+    """
+
+    MICROSOFT_STORAGE = "Microsoft.Storage"
+    MICROSOFT_KEYVAULT = "Microsoft.Keyvault"
+
+
+class KeyType(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+    """Encryption key type to be used for the encryption service. 'Account' key type implies that an
+    account-scoped encryption key will be used. 'Service' key type implies that a default service
+    key is used.
+    """
+
+    SERVICE = "Service"
+    ACCOUNT = "Account"
+
+
+class Kind(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+    """Indicates the type of storage account."""
+
+    STORAGE = "Storage"
+    STORAGE_V2 = "StorageV2"
+    BLOB_STORAGE = "BlobStorage"
+    FILE_STORAGE = "FileStorage"
+    BLOCK_BLOB_STORAGE = "BlockBlobStorage"
+
+
+class LargeFileSharesState(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+    """Allow large file shares if sets to Enabled. It cannot be disabled once it is enabled."""
+
+    DISABLED = "Disabled"
+    ENABLED = "Enabled"
+
+
+class LeaseContainerRequestEnum(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+    """Specifies the lease action. Can be one of the available actions."""
+
+    ACQUIRE = "Acquire"
+    RENEW = "Renew"
+    CHANGE = "Change"
+    RELEASE = "Release"
+    BREAK = "Break"
+    BREAK_ENUM = "Break"
+
+
+class LeaseDuration(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+    """Specifies whether the lease on a container is of infinite or fixed duration, only when the
+    container is leased.
+    """
+
+    INFINITE = "Infinite"
+    FIXED = "Fixed"
+
+
+class LeaseShareAction(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+    """Specifies the lease action. Can be one of the available actions."""
+
+    ACQUIRE = "Acquire"
+    RENEW = "Renew"
+    CHANGE = "Change"
+    RELEASE = "Release"
+    BREAK = "Break"
+    BREAK_ENUM = "Break"
+
+
+class LeaseState(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+    """Lease state of the container."""
+
+    AVAILABLE = "Available"
+    LEASED = "Leased"
+    EXPIRED = "Expired"
+    BREAKING = "Breaking"
+    BROKEN = "Broken"
+
+
+class LeaseStatus(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+    """The lease status of the container."""
+
+    LOCKED = "Locked"
+    UNLOCKED = "Unlocked"
+
+
+class ListContainersInclude(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+    """ListContainersInclude."""
+
+    DELETED = "deleted"
+
+
+class ListEncryptionScopesInclude(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+    """ListEncryptionScopesInclude."""
+
+    ALL = "All"
+    ENABLED = "Enabled"
+    DISABLED = "Disabled"
+
+
+class ListLocalUserIncludeParam(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+    """ListLocalUserIncludeParam."""
+
+    NFSV3 = "nfsv3"
+
+
+class ManagementPolicyName(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+    """ManagementPolicyName."""
+
+    DEFAULT = "default"
+
+
+class MigrationName(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+    """MigrationName."""
+
+    DEFAULT = "default"
+
+
+class MigrationState(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+    """This property denotes the container level immutability to object level immutability migration
+    state.
+    """
+
+    IN_PROGRESS = "InProgress"
+    COMPLETED = "Completed"
+
+
+class MigrationStatus(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+    """Current status of migration."""
+
+    INVALID = "Invalid"
+    SUBMITTED_FOR_CONVERSION = "SubmittedForConversion"
+    IN_PROGRESS = "InProgress"
+    COMPLETE = "Complete"
+    FAILED = "Failed"
+
+
+class MinimumTlsVersion(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+    """Set the minimum TLS version to be permitted on requests to storage. The default interpretation
+    is TLS 1.0 for this property.
+    """
+
+    TLS1_0 = "TLS1_0"
+    TLS1_1 = "TLS1_1"
+    TLS1_2 = "TLS1_2"
+    TLS1_3 = "TLS1_3"
+
+
+class Name(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+    """Name of the policy. The valid value is AccessTimeTracking. This field is currently read only."""
+
+    ACCESS_TIME_TRACKING = "AccessTimeTracking"
+
+
+class NetworkSecurityPerimeterConfigurationProvisioningState(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+    """Provisioning state of Network Security Perimeter configuration propagation."""
+
+    ACCEPTED = "Accepted"
+    SUCCEEDED = "Succeeded"
+    FAILED = "Failed"
+    DELETING = "Deleting"
+    CANCELED = "Canceled"
+
+
+class NspAccessRuleDirection(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+    """Direction of Access Rule."""
+
+    INBOUND = "Inbound"
+    OUTBOUND = "Outbound"
+
+
+class ObjectType(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+    """This is a required field. This field specifies the scope of the inventory created either at the
+    blob or container level.
+    """
+
+    BLOB = "Blob"
+    CONTAINER = "Container"
+
+
+class Permissions(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+    """The signed permissions for the account SAS. Possible values include: Read (r), Write (w),
+    Delete (d), List (l), Add (a), Create (c), Update (u) and Process (p).
+    """
+
+    R = "r"
+    D = "d"
+    W = "w"
+    L = "l"
+    A = "a"
+    C = "c"
+    U = "u"
+    P = "p"
+
+
+class PostFailoverRedundancy(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+    """The redundancy type of the account after an account failover is performed."""
+
+    STANDARD_LRS = "Standard_LRS"
+    STANDARD_ZRS = "Standard_ZRS"
+
+
+class PostPlannedFailoverRedundancy(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+    """The redundancy type of the account after a planned account failover is performed."""
+
+    STANDARD_GRS = "Standard_GRS"
+    STANDARD_GZRS = "Standard_GZRS"
+    STANDARD_RAGRS = "Standard_RAGRS"
+    STANDARD_RAGZRS = "Standard_RAGZRS"
+
+
+class PrivateEndpointConnectionProvisioningState(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+    """The current provisioning state."""
+
+    SUCCEEDED = "Succeeded"
+    CREATING = "Creating"
+    DELETING = "Deleting"
+    FAILED = "Failed"
+
+
+class PrivateEndpointServiceConnectionStatus(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+    """The private endpoint connection status."""
+
+    PENDING = "Pending"
+    APPROVED = "Approved"
+    REJECTED = "Rejected"
+
+
+class ProvisioningState(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+    """Gets the status of the storage account at the time the operation was called."""
+
+    CREATING = "Creating"
+    RESOLVING_DNS = "ResolvingDNS"
+    SUCCEEDED = "Succeeded"
+    VALIDATE_SUBSCRIPTION_QUOTA_BEGIN = "ValidateSubscriptionQuotaBegin"
+    VALIDATE_SUBSCRIPTION_QUOTA_END = "ValidateSubscriptionQuotaEnd"
+    DELETING = "Deleting"
+    CANCELED = "Canceled"
+    FAILED = "Failed"
+
+
+class PublicAccess(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+    """Specifies whether data in the container may be accessed publicly and the level of access."""
+
+    CONTAINER = "Container"
+    BLOB = "Blob"
+    NONE = "None"
+
+
+class PublicNetworkAccess(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+    """Allow, disallow, or let Network Security Perimeter configuration to evaluate public network
+    access to Storage Account. Value is optional but if passed in, must be 'Enabled', 'Disabled' or
+    'SecuredByPerimeter'.
+    """
+
+    ENABLED = "Enabled"
+    DISABLED = "Disabled"
+    SECURED_BY_PERIMETER = "SecuredByPerimeter"
+
+
+class Reason(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+    """Gets the reason that a storage account name could not be used. The Reason element is only
+    returned if NameAvailable is false.
+    """
+
+    ACCOUNT_NAME_INVALID = "AccountNameInvalid"
+    ALREADY_EXISTS = "AlreadyExists"
+
+
+class ReasonCode(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+    """The reason for the restriction. As of now this can be "QuotaId" or
+    "NotAvailableForSubscription". Quota Id is set when the SKU has requiredQuotas parameter as the
+    subscription does not belong to that quota. The "NotAvailableForSubscription" is related to
+    capacity at DC.
+    """
+
+    QUOTA_ID = "QuotaId"
+    NOT_AVAILABLE_FOR_SUBSCRIPTION = "NotAvailableForSubscription"
+
+
+class ResourceAssociationAccessMode(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+    """Access Mode of the resource association."""
+
+    ENFORCED = "Enforced"
+    LEARNING = "Learning"
+    AUDIT = "Audit"
+
+
+class RootSquashType(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+    """The property is for NFS share only. The default is NoRootSquash."""
+
+    NO_ROOT_SQUASH = "NoRootSquash"
+    ROOT_SQUASH = "RootSquash"
+    ALL_SQUASH = "AllSquash"
+
+
+class RoutingChoice(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+    """Routing Choice defines the kind of network routing opted by the user."""
+
+    MICROSOFT_ROUTING = "MicrosoftRouting"
+    INTERNET_ROUTING = "InternetRouting"
+
+
+class RuleType(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+    """The valid value is Lifecycle."""
+
+    LIFECYCLE = "Lifecycle"
+
+
+class RunResult(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+    """Represents the overall result of the execution for the run instance."""
+
+    SUCCEEDED = "Succeeded"
+    FAILED = "Failed"
+
+
+class RunStatusEnum(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+    """Represents the status of the execution."""
+
+    IN_PROGRESS = "InProgress"
+    FINISHED = "Finished"
+
+
+class Schedule(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+    """This is a required field. This field is used to schedule an inventory formation."""
+
+    DAILY = "Daily"
+    WEEKLY = "Weekly"
+
+
+class Services(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+    """The signed services accessible with the account SAS. Possible values include: Blob (b), Queue
+    (q), Table (t), File (f).
+    """
+
+    B = "b"
+    Q = "q"
+    T = "t"
+    F = "f"
+
+
+class Severity(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+    """Severity of the issue."""
+
+    WARNING = "Warning"
+    ERROR = "Error"
+
+
+class ShareAccessTier(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+    """Access tier for specific share. GpV2 account can choose between TransactionOptimized (default),
+    Hot, and Cool. FileStorage account can choose Premium.
+    """
+
+    TRANSACTION_OPTIMIZED = "TransactionOptimized"
+    HOT = "Hot"
+    COOL = "Cool"
+    PREMIUM = "Premium"
+
+
+class SignedResource(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+    """The signed services accessible with the service SAS. Possible values include: Blob (b),
+    Container (c), File (f), Share (s).
+    """
+
+    B = "b"
+    C = "c"
+    F = "f"
+    S = "s"
+
+
+class SignedResourceTypes(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+    """The signed resource types that are accessible with the account SAS. Service (s): Access to
+    service-level APIs; Container (c): Access to container-level APIs; Object (o): Access to
+    object-level APIs for blobs, queue messages, table entities, and files.
+    """
+
+    S = "s"
+    C = "c"
+    O = "o"
+
+
+class SkuConversionStatus(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+    """This property indicates the current sku conversion status."""
+
+    IN_PROGRESS = "InProgress"
+    SUCCEEDED = "Succeeded"
+    FAILED = "Failed"
+
+
+class SkuName(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+    """The SKU name. Required for account creation; optional for update. Note that in older versions,
+    SKU name was called accountType.
+    """
+
+    STANDARD_LRS = "Standard_LRS"
+    STANDARD_GRS = "Standard_GRS"
+    STANDARD_RAGRS = "Standard_RAGRS"
+    STANDARD_ZRS = "Standard_ZRS"
+    PREMIUM_LRS = "Premium_LRS"
+    PREMIUM_ZRS = "Premium_ZRS"
+    STANDARD_GZRS = "Standard_GZRS"
+    STANDARD_RAGZRS = "Standard_RAGZRS"
+    STANDARD_V2_LRS = "StandardV2_LRS"
+    STANDARD_V2_GRS = "StandardV2_GRS"
+    STANDARD_V2_ZRS = "StandardV2_ZRS"
+    STANDARD_V2_GZRS = "StandardV2_GZRS"
+    PREMIUM_V2_LRS = "PremiumV2_LRS"
+    PREMIUM_V2_ZRS = "PremiumV2_ZRS"
+
+
+class SkuTier(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+    """The SKU tier. This is based on the SKU name."""
+
+    STANDARD = "Standard"
+    PREMIUM = "Premium"
+
+
+class State(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+    """Gets the state of virtual network rule."""
+
+    PROVISIONING = "Provisioning"
+    DEPROVISIONING = "Deprovisioning"
+    SUCCEEDED = "Succeeded"
+    FAILED = "Failed"
+    NETWORK_SOURCE_DELETED = "NetworkSourceDeleted"
+
+
+class StorageAccountExpand(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+    """StorageAccountExpand."""
+
+    GEO_REPLICATION_STATS = "geoReplicationStats"
+    BLOB_RESTORE_STATUS = "blobRestoreStatus"
+
+
+class TriggerType(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+    """The trigger type of the storage task assignment execution."""
+
+    RUN_ONCE = "RunOnce"
+    ON_SCHEDULE = "OnSchedule"
+
+
+class UsageUnit(str, Enum, metaclass=CaseInsensitiveEnumMeta):
+    """Gets the unit of measurement."""
+
+    COUNT = "Count"
+    BYTES = "Bytes"
+    SECONDS = "Seconds"
+    PERCENT = "Percent"
+    COUNTS_PER_SECOND = "CountsPerSecond"
+    BYTES_PER_SECOND = "BytesPerSecond"
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/operations/__init__.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/operations/__init__.py
new file mode 100644
index 000000000000..18334b99b3ea
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/operations/__init__.py
@@ -0,0 +1,71 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+# pylint: disable=wrong-import-position
+
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._blob_services_operations import BlobServicesOperations  # type: ignore
+from ._blob_containers_operations import BlobContainersOperations  # type: ignore
+from ._file_services_operations import FileServicesOperations  # type: ignore
+from ._file_shares_operations import FileSharesOperations  # type: ignore
+from ._queue_services_operations import QueueServicesOperations  # type: ignore
+from ._queue_operations import QueueOperations  # type: ignore
+from ._operations import Operations  # type: ignore
+from ._skus_operations import SkusOperations  # type: ignore
+from ._storage_accounts_operations import StorageAccountsOperations  # type: ignore
+from ._deleted_accounts_operations import DeletedAccountsOperations  # type: ignore
+from ._usages_operations import UsagesOperations  # type: ignore
+from ._management_policies_operations import ManagementPoliciesOperations  # type: ignore
+from ._blob_inventory_policies_operations import BlobInventoryPoliciesOperations  # type: ignore
+from ._private_endpoint_connections_operations import PrivateEndpointConnectionsOperations  # type: ignore
+from ._private_link_resources_operations import PrivateLinkResourcesOperations  # type: ignore
+from ._object_replication_policies_operations import ObjectReplicationPoliciesOperations  # type: ignore
+from ._local_users_operations import LocalUsersOperations  # type: ignore
+from ._encryption_scopes_operations import EncryptionScopesOperations  # type: ignore
+from ._table_services_operations import TableServicesOperations  # type: ignore
+from ._table_operations import TableOperations  # type: ignore
+from ._network_security_perimeter_configurations_operations import NetworkSecurityPerimeterConfigurationsOperations  # type: ignore
+from ._storage_task_assignments_operations import StorageTaskAssignmentsOperations  # type: ignore
+from ._storage_task_assignments_instances_report_operations import StorageTaskAssignmentsInstancesReportOperations  # type: ignore
+from ._storage_task_assignment_instances_report_operations import StorageTaskAssignmentInstancesReportOperations  # type: ignore
+
+from ._patch import __all__ as _patch_all
+from ._patch import *
+from ._patch import patch_sdk as _patch_sdk
+
+__all__ = [
+    "BlobServicesOperations",
+    "BlobContainersOperations",
+    "FileServicesOperations",
+    "FileSharesOperations",
+    "QueueServicesOperations",
+    "QueueOperations",
+    "Operations",
+    "SkusOperations",
+    "StorageAccountsOperations",
+    "DeletedAccountsOperations",
+    "UsagesOperations",
+    "ManagementPoliciesOperations",
+    "BlobInventoryPoliciesOperations",
+    "PrivateEndpointConnectionsOperations",
+    "PrivateLinkResourcesOperations",
+    "ObjectReplicationPoliciesOperations",
+    "LocalUsersOperations",
+    "EncryptionScopesOperations",
+    "TableServicesOperations",
+    "TableOperations",
+    "NetworkSecurityPerimeterConfigurationsOperations",
+    "StorageTaskAssignmentsOperations",
+    "StorageTaskAssignmentsInstancesReportOperations",
+    "StorageTaskAssignmentInstancesReportOperations",
+]
+__all__.extend([p for p in _patch_all if p not in __all__])  # pyright: ignore
+_patch_sdk()
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/operations/_blob_containers_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/operations/_blob_containers_operations.py
new file mode 100644
index 000000000000..13f46fed6d0f
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/operations/_blob_containers_operations.py
@@ -0,0 +1,2389 @@
+# 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.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+from io import IOBase
+import sys
+from typing import Any, Callable, Dict, IO, Iterable, Iterator, Literal, Optional, TypeVar, Union, cast, overload
+import urllib.parse
+
+from azure.core.exceptions import (
+    ClientAuthenticationError,
+    HttpResponseError,
+    ResourceExistsError,
+    ResourceNotFoundError,
+    ResourceNotModifiedError,
+    StreamClosedError,
+    StreamConsumedError,
+    map_error,
+)
+from azure.core.paging import ItemPaged
+from azure.core.pipeline import PipelineResponse
+from azure.core.polling import LROPoller, NoPolling, PollingMethod
+from azure.core.rest import HttpRequest, HttpResponse
+from azure.core.tracing.decorator import distributed_trace
+from azure.core.utils import case_insensitive_dict
+from azure.mgmt.core.exceptions import ARMErrorFormat
+from azure.mgmt.core.polling.arm_polling import ARMPolling
+
+from .. import models as _models
+from ..._serialization import Serializer
+
+if sys.version_info >= (3, 9):
+    from collections.abc import MutableMapping
+else:
+    from typing import MutableMapping  # type: ignore
+T = TypeVar("T")
+ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
+
+_SERIALIZER = Serializer()
+_SERIALIZER.client_side_validation = False
+
+
+def build_list_request(
+    resource_group_name: str,
+    account_name: str,
+    subscription_id: str,
+    *,
+    maxpagesize: Optional[str] = None,
+    filter: Optional[str] = None,
+    include: Optional[Union[str, _models.ListContainersInclude]] = None,
+    **kwargs: Any
+) -> HttpRequest:
+    _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
+    _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-01-01"))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/blobServices/default/containers",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+    if maxpagesize is not None:
+        _params["$maxpagesize"] = _SERIALIZER.query("maxpagesize", maxpagesize, "str")
+    if filter is not None:
+        _params["$filter"] = _SERIALIZER.query("filter", filter, "str")
+    if include is not None:
+        _params["$include"] = _SERIALIZER.query("include", include, "str")
+
+    # Construct headers
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+def build_create_request(
+    resource_group_name: str, account_name: str, container_name: str, 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-01-01"))
+    content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/blobServices/default/containers/{containerName}",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "containerName": _SERIALIZER.url("container_name", container_name, "str", max_length=63, min_length=3),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    if content_type is not None:
+        _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str")
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="PUT", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+def build_update_request(
+    resource_group_name: str, account_name: str, container_name: str, 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-01-01"))
+    content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/blobServices/default/containers/{containerName}",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "containerName": _SERIALIZER.url("container_name", container_name, "str", max_length=63, min_length=3),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    if content_type is not None:
+        _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str")
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="PATCH", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+def build_get_request(
+    resource_group_name: str, account_name: str, container_name: str, 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-01-01"))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/blobServices/default/containers/{containerName}",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "containerName": _SERIALIZER.url("container_name", container_name, "str", max_length=63, min_length=3),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+def build_delete_request(
+    resource_group_name: str, account_name: str, container_name: str, subscription_id: str, **kwargs: Any
+) -> HttpRequest:
+    _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-01-01"))
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/blobServices/default/containers/{containerName}",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "containerName": _SERIALIZER.url("container_name", container_name, "str", max_length=63, min_length=3),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    return HttpRequest(method="DELETE", url=_url, params=_params, **kwargs)
+
+
+def build_set_legal_hold_request(
+    resource_group_name: str, account_name: str, container_name: str, 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-01-01"))
+    content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/blobServices/default/containers/{containerName}/setLegalHold",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "containerName": _SERIALIZER.url("container_name", container_name, "str", max_length=63, min_length=3),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    if content_type is not None:
+        _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str")
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="POST", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+def build_clear_legal_hold_request(
+    resource_group_name: str, account_name: str, container_name: str, 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-01-01"))
+    content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/blobServices/default/containers/{containerName}/clearLegalHold",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "containerName": _SERIALIZER.url("container_name", container_name, "str", max_length=63, min_length=3),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    if content_type is not None:
+        _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str")
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="POST", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+def build_create_or_update_immutability_policy_request(  # pylint: disable=name-too-long
+    resource_group_name: str,
+    account_name: str,
+    container_name: str,
+    subscription_id: str,
+    *,
+    if_match: Optional[str] = None,
+    **kwargs: Any
+) -> HttpRequest:
+    _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
+    _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+    immutability_policy_name: Literal["default"] = kwargs.pop("immutability_policy_name", "default")
+    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-01-01"))
+    content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/blobServices/default/containers/{containerName}/immutabilityPolicies/{immutabilityPolicyName}",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "containerName": _SERIALIZER.url("container_name", container_name, "str", max_length=63, min_length=3),
+        "immutabilityPolicyName": _SERIALIZER.url("immutability_policy_name", immutability_policy_name, "str"),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    if if_match is not None:
+        _headers["If-Match"] = _SERIALIZER.header("if_match", if_match, "str")
+    if content_type is not None:
+        _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str")
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="PUT", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+def build_get_immutability_policy_request(
+    resource_group_name: str,
+    account_name: str,
+    container_name: str,
+    subscription_id: str,
+    *,
+    if_match: Optional[str] = None,
+    **kwargs: Any
+) -> HttpRequest:
+    _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
+    _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+    immutability_policy_name: Literal["default"] = kwargs.pop("immutability_policy_name", "default")
+    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-01-01"))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/blobServices/default/containers/{containerName}/immutabilityPolicies/{immutabilityPolicyName}",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "containerName": _SERIALIZER.url("container_name", container_name, "str", max_length=63, min_length=3),
+        "immutabilityPolicyName": _SERIALIZER.url("immutability_policy_name", immutability_policy_name, "str"),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    if if_match is not None:
+        _headers["If-Match"] = _SERIALIZER.header("if_match", if_match, "str")
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+def build_delete_immutability_policy_request(
+    resource_group_name: str,
+    account_name: str,
+    container_name: str,
+    subscription_id: str,
+    *,
+    if_match: str,
+    **kwargs: Any
+) -> HttpRequest:
+    _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
+    _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+    immutability_policy_name: Literal["default"] = kwargs.pop("immutability_policy_name", "default")
+    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-01-01"))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/blobServices/default/containers/{containerName}/immutabilityPolicies/{immutabilityPolicyName}",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "containerName": _SERIALIZER.url("container_name", container_name, "str", max_length=63, min_length=3),
+        "immutabilityPolicyName": _SERIALIZER.url("immutability_policy_name", immutability_policy_name, "str"),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    _headers["If-Match"] = _SERIALIZER.header("if_match", if_match, "str")
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="DELETE", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+def build_lock_immutability_policy_request(
+    resource_group_name: str,
+    account_name: str,
+    container_name: str,
+    subscription_id: str,
+    *,
+    if_match: 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-01-01"))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/blobServices/default/containers/{containerName}/immutabilityPolicies/default/lock",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "containerName": _SERIALIZER.url("container_name", container_name, "str", max_length=63, min_length=3),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    _headers["If-Match"] = _SERIALIZER.header("if_match", if_match, "str")
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="POST", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+def build_extend_immutability_policy_request(
+    resource_group_name: str,
+    account_name: str,
+    container_name: str,
+    subscription_id: str,
+    *,
+    if_match: 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-01-01"))
+    content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/blobServices/default/containers/{containerName}/immutabilityPolicies/default/extend",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "containerName": _SERIALIZER.url("container_name", container_name, "str", max_length=63, min_length=3),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    _headers["If-Match"] = _SERIALIZER.header("if_match", if_match, "str")
+    if content_type is not None:
+        _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str")
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="POST", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+def build_lease_request(
+    resource_group_name: str, account_name: str, container_name: str, 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-01-01"))
+    content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/blobServices/default/containers/{containerName}/lease",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "containerName": _SERIALIZER.url("container_name", container_name, "str", max_length=63, min_length=3),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    if content_type is not None:
+        _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str")
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="POST", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+def build_object_level_worm_request(
+    resource_group_name: str, account_name: str, container_name: str, 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-01-01"))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/blobServices/default/containers/{containerName}/migrate",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "containerName": _SERIALIZER.url("container_name", container_name, "str", max_length=63, min_length=3),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="POST", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+class BlobContainersOperations:
+    """
+    .. warning::
+        **DO NOT** instantiate this class directly.
+
+        Instead, you should access the following operations through
+        :class:`~azure.mgmt.storage.v2024_01_01.StorageManagementClient`'s
+        :attr:`blob_containers` attribute.
+    """
+
+    models = _models
+
+    def __init__(self, *args, **kwargs):
+        input_args = list(args)
+        self._client = input_args.pop(0) if input_args else kwargs.pop("client")
+        self._config = input_args.pop(0) if input_args else kwargs.pop("config")
+        self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer")
+        self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer")
+        self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version")
+
+    @distributed_trace
+    def list(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        maxpagesize: Optional[str] = None,
+        filter: Optional[str] = None,
+        include: Optional[Union[str, _models.ListContainersInclude]] = None,
+        **kwargs: Any
+    ) -> Iterable["_models.ListContainerItem"]:
+        """Lists all containers and does not support a prefix like data plane. Also SRP today does not
+        return continuation token.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param maxpagesize: Optional. Specified maximum number of containers that can be included in
+         the list. Default value is None.
+        :type maxpagesize: str
+        :param filter: Optional. When specified, only container names starting with the filter will be
+         listed. Default value is None.
+        :type filter: str
+        :param include: Optional, used to include the properties for soft deleted blob containers.
+         "deleted" Default value is None.
+        :type include: str or ~azure.mgmt.storage.v2024_01_01.models.ListContainersInclude
+        :return: An iterator like instance of either ListContainerItem or the result of cls(response)
+        :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.storage.v2024_01_01.models.ListContainerItem]
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.ListContainerItems] = kwargs.pop("cls", None)
+
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        def prepare_request(next_link=None):
+            if not next_link:
+
+                _request = build_list_request(
+                    resource_group_name=resource_group_name,
+                    account_name=account_name,
+                    subscription_id=self._config.subscription_id,
+                    maxpagesize=maxpagesize,
+                    filter=filter,
+                    include=include,
+                    api_version=api_version,
+                    headers=_headers,
+                    params=_params,
+                )
+                _request.url = self._client.format_url(_request.url)
+
+            else:
+                # make call to next link with the client's api-version
+                _parsed_next_link = urllib.parse.urlparse(next_link)
+                _next_request_params = case_insensitive_dict(
+                    {
+                        key: [urllib.parse.quote(v) for v in value]
+                        for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items()
+                    }
+                )
+                _next_request_params["api-version"] = self._api_version
+                _request = HttpRequest(
+                    "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
+                )
+                _request.url = self._client.format_url(_request.url)
+                _request.method = "GET"
+            return _request
+
+        def extract_data(pipeline_response):
+            deserialized = self._deserialize("ListContainerItems", pipeline_response)
+            list_of_elem = deserialized.value
+            if cls:
+                list_of_elem = cls(list_of_elem)  # type: ignore
+            return deserialized.next_link or None, iter(list_of_elem)
+
+        def get_next(next_link=None):
+            _request = prepare_request(next_link)
+
+            _stream = False
+            pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+                _request, stream=_stream, **kwargs
+            )
+            response = pipeline_response.http_response
+
+            if response.status_code not in [200]:
+                map_error(status_code=response.status_code, response=response, error_map=error_map)
+                raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+            return pipeline_response
+
+        return ItemPaged(get_next, extract_data)
+
+    @overload
+    def create(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        container_name: str,
+        blob_container: _models.BlobContainer,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.BlobContainer:
+        """Creates a new container under the specified account as described by request body. The container
+        resource includes metadata and properties for that container. It does not include a list of the
+        blobs contained by the container.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param container_name: The name of the blob container within the specified storage account.
+         Blob container names must be between 3 and 63 characters in length and use numbers, lower-case
+         letters and dash (-) only. Every dash (-) character must be immediately preceded and followed
+         by a letter or number. Required.
+        :type container_name: str
+        :param blob_container: Properties of the blob container to create. Required.
+        :type blob_container: ~azure.mgmt.storage.v2024_01_01.models.BlobContainer
+        :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: BlobContainer or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.BlobContainer
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @overload
+    def create(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        container_name: str,
+        blob_container: IO[bytes],
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.BlobContainer:
+        """Creates a new container under the specified account as described by request body. The container
+        resource includes metadata and properties for that container. It does not include a list of the
+        blobs contained by the container.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param container_name: The name of the blob container within the specified storage account.
+         Blob container names must be between 3 and 63 characters in length and use numbers, lower-case
+         letters and dash (-) only. Every dash (-) character must be immediately preceded and followed
+         by a letter or number. Required.
+        :type container_name: str
+        :param blob_container: Properties of the blob container to create. Required.
+        :type blob_container: IO[bytes]
+        :keyword content_type: Body Parameter content-type. Content type parameter for binary body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: BlobContainer or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.BlobContainer
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @distributed_trace
+    def create(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        container_name: str,
+        blob_container: Union[_models.BlobContainer, IO[bytes]],
+        **kwargs: Any
+    ) -> _models.BlobContainer:
+        """Creates a new container under the specified account as described by request body. The container
+        resource includes metadata and properties for that container. It does not include a list of the
+        blobs contained by the container.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param container_name: The name of the blob container within the specified storage account.
+         Blob container names must be between 3 and 63 characters in length and use numbers, lower-case
+         letters and dash (-) only. Every dash (-) character must be immediately preceded and followed
+         by a letter or number. Required.
+        :type container_name: str
+        :param blob_container: Properties of the blob container to create. Is either a BlobContainer
+         type or a IO[bytes] type. Required.
+        :type blob_container: ~azure.mgmt.storage.v2024_01_01.models.BlobContainer or IO[bytes]
+        :return: BlobContainer or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.BlobContainer
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _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", self._api_version or "2024-01-01"))
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+        cls: ClsType[_models.BlobContainer] = kwargs.pop("cls", None)
+
+        content_type = content_type or "application/json"
+        _json = None
+        _content = None
+        if isinstance(blob_container, (IOBase, bytes)):
+            _content = blob_container
+        else:
+            _json = self._serialize.body(blob_container, "BlobContainer")
+
+        _request = build_create_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            container_name=container_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            content_type=content_type,
+            json=_json,
+            content=_content,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200, 201]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @overload
+    def update(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        container_name: str,
+        blob_container: _models.BlobContainer,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.BlobContainer:
+        """Updates container properties as specified in request body. Properties not mentioned in the
+        request will be unchanged. Update fails if the specified container doesn't already exist.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param container_name: The name of the blob container within the specified storage account.
+         Blob container names must be between 3 and 63 characters in length and use numbers, lower-case
+         letters and dash (-) only. Every dash (-) character must be immediately preceded and followed
+         by a letter or number. Required.
+        :type container_name: str
+        :param blob_container: Properties to update for the blob container. Required.
+        :type blob_container: ~azure.mgmt.storage.v2024_01_01.models.BlobContainer
+        :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: BlobContainer or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.BlobContainer
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @overload
+    def update(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        container_name: str,
+        blob_container: IO[bytes],
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.BlobContainer:
+        """Updates container properties as specified in request body. Properties not mentioned in the
+        request will be unchanged. Update fails if the specified container doesn't already exist.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param container_name: The name of the blob container within the specified storage account.
+         Blob container names must be between 3 and 63 characters in length and use numbers, lower-case
+         letters and dash (-) only. Every dash (-) character must be immediately preceded and followed
+         by a letter or number. Required.
+        :type container_name: str
+        :param blob_container: Properties to update for the blob container. Required.
+        :type blob_container: IO[bytes]
+        :keyword content_type: Body Parameter content-type. Content type parameter for binary body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: BlobContainer or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.BlobContainer
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @distributed_trace
+    def update(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        container_name: str,
+        blob_container: Union[_models.BlobContainer, IO[bytes]],
+        **kwargs: Any
+    ) -> _models.BlobContainer:
+        """Updates container properties as specified in request body. Properties not mentioned in the
+        request will be unchanged. Update fails if the specified container doesn't already exist.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param container_name: The name of the blob container within the specified storage account.
+         Blob container names must be between 3 and 63 characters in length and use numbers, lower-case
+         letters and dash (-) only. Every dash (-) character must be immediately preceded and followed
+         by a letter or number. Required.
+        :type container_name: str
+        :param blob_container: Properties to update for the blob container. Is either a BlobContainer
+         type or a IO[bytes] type. Required.
+        :type blob_container: ~azure.mgmt.storage.v2024_01_01.models.BlobContainer or IO[bytes]
+        :return: BlobContainer or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.BlobContainer
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _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", self._api_version or "2024-01-01"))
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+        cls: ClsType[_models.BlobContainer] = kwargs.pop("cls", None)
+
+        content_type = content_type or "application/json"
+        _json = None
+        _content = None
+        if isinstance(blob_container, (IOBase, bytes)):
+            _content = blob_container
+        else:
+            _json = self._serialize.body(blob_container, "BlobContainer")
+
+        _request = build_update_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            container_name=container_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            content_type=content_type,
+            json=_json,
+            content=_content,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @distributed_trace
+    def get(
+        self, resource_group_name: str, account_name: str, container_name: str, **kwargs: Any
+    ) -> _models.BlobContainer:
+        """Gets properties of a specified container.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param container_name: The name of the blob container within the specified storage account.
+         Blob container names must be between 3 and 63 characters in length and use numbers, lower-case
+         letters and dash (-) only. Every dash (-) character must be immediately preceded and followed
+         by a letter or number. Required.
+        :type container_name: str
+        :return: BlobContainer or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.BlobContainer
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.BlobContainer] = kwargs.pop("cls", None)
+
+        _request = build_get_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            container_name=container_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("BlobContainer", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @distributed_trace
+    def delete(  # pylint: disable=inconsistent-return-statements
+        self, resource_group_name: str, account_name: str, container_name: str, **kwargs: Any
+    ) -> None:
+        """Deletes specified container under its account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param container_name: The name of the blob container within the specified storage account.
+         Blob container names must be between 3 and 63 characters in length and use numbers, lower-case
+         letters and dash (-) only. Every dash (-) character must be immediately preceded and followed
+         by a letter or number. Required.
+        :type container_name: str
+        :return: None or the result of cls(response)
+        :rtype: None
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[None] = kwargs.pop("cls", None)
+
+        _request = build_delete_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            container_name=container_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200, 204]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        if cls:
+            return cls(pipeline_response, None, {})  # type: ignore
+
+    @overload
+    def set_legal_hold(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        container_name: str,
+        legal_hold: _models.LegalHold,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.LegalHold:
+        """Sets legal hold tags. Setting the same tag results in an idempotent operation. SetLegalHold
+        follows an append pattern and does not clear out the existing tags that are not specified in
+        the request.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param container_name: The name of the blob container within the specified storage account.
+         Blob container names must be between 3 and 63 characters in length and use numbers, lower-case
+         letters and dash (-) only. Every dash (-) character must be immediately preceded and followed
+         by a letter or number. Required.
+        :type container_name: str
+        :param legal_hold: The LegalHold property that will be set to a blob container. Required.
+        :type legal_hold: ~azure.mgmt.storage.v2024_01_01.models.LegalHold
+        :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: LegalHold or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.LegalHold
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @overload
+    def set_legal_hold(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        container_name: str,
+        legal_hold: IO[bytes],
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.LegalHold:
+        """Sets legal hold tags. Setting the same tag results in an idempotent operation. SetLegalHold
+        follows an append pattern and does not clear out the existing tags that are not specified in
+        the request.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param container_name: The name of the blob container within the specified storage account.
+         Blob container names must be between 3 and 63 characters in length and use numbers, lower-case
+         letters and dash (-) only. Every dash (-) character must be immediately preceded and followed
+         by a letter or number. Required.
+        :type container_name: str
+        :param legal_hold: The LegalHold property that will be set to a blob container. Required.
+        :type legal_hold: IO[bytes]
+        :keyword content_type: Body Parameter content-type. Content type parameter for binary body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: LegalHold or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.LegalHold
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @distributed_trace
+    def set_legal_hold(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        container_name: str,
+        legal_hold: Union[_models.LegalHold, IO[bytes]],
+        **kwargs: Any
+    ) -> _models.LegalHold:
+        """Sets legal hold tags. Setting the same tag results in an idempotent operation. SetLegalHold
+        follows an append pattern and does not clear out the existing tags that are not specified in
+        the request.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param container_name: The name of the blob container within the specified storage account.
+         Blob container names must be between 3 and 63 characters in length and use numbers, lower-case
+         letters and dash (-) only. Every dash (-) character must be immediately preceded and followed
+         by a letter or number. Required.
+        :type container_name: str
+        :param legal_hold: The LegalHold property that will be set to a blob container. Is either a
+         LegalHold type or a IO[bytes] type. Required.
+        :type legal_hold: ~azure.mgmt.storage.v2024_01_01.models.LegalHold or IO[bytes]
+        :return: LegalHold or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.LegalHold
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _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", self._api_version or "2024-01-01"))
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+        cls: ClsType[_models.LegalHold] = kwargs.pop("cls", None)
+
+        content_type = content_type or "application/json"
+        _json = None
+        _content = None
+        if isinstance(legal_hold, (IOBase, bytes)):
+            _content = legal_hold
+        else:
+            _json = self._serialize.body(legal_hold, "LegalHold")
+
+        _request = build_set_legal_hold_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            container_name=container_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            content_type=content_type,
+            json=_json,
+            content=_content,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("LegalHold", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @overload
+    def clear_legal_hold(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        container_name: str,
+        legal_hold: _models.LegalHold,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.LegalHold:
+        """Clears legal hold tags. Clearing the same or non-existent tag results in an idempotent
+        operation. ClearLegalHold clears out only the specified tags in the request.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param container_name: The name of the blob container within the specified storage account.
+         Blob container names must be between 3 and 63 characters in length and use numbers, lower-case
+         letters and dash (-) only. Every dash (-) character must be immediately preceded and followed
+         by a letter or number. Required.
+        :type container_name: str
+        :param legal_hold: The LegalHold property that will be clear from a blob container. Required.
+        :type legal_hold: ~azure.mgmt.storage.v2024_01_01.models.LegalHold
+        :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: LegalHold or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.LegalHold
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @overload
+    def clear_legal_hold(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        container_name: str,
+        legal_hold: IO[bytes],
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.LegalHold:
+        """Clears legal hold tags. Clearing the same or non-existent tag results in an idempotent
+        operation. ClearLegalHold clears out only the specified tags in the request.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param container_name: The name of the blob container within the specified storage account.
+         Blob container names must be between 3 and 63 characters in length and use numbers, lower-case
+         letters and dash (-) only. Every dash (-) character must be immediately preceded and followed
+         by a letter or number. Required.
+        :type container_name: str
+        :param legal_hold: The LegalHold property that will be clear from a blob container. Required.
+        :type legal_hold: IO[bytes]
+        :keyword content_type: Body Parameter content-type. Content type parameter for binary body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: LegalHold or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.LegalHold
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @distributed_trace
+    def clear_legal_hold(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        container_name: str,
+        legal_hold: Union[_models.LegalHold, IO[bytes]],
+        **kwargs: Any
+    ) -> _models.LegalHold:
+        """Clears legal hold tags. Clearing the same or non-existent tag results in an idempotent
+        operation. ClearLegalHold clears out only the specified tags in the request.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param container_name: The name of the blob container within the specified storage account.
+         Blob container names must be between 3 and 63 characters in length and use numbers, lower-case
+         letters and dash (-) only. Every dash (-) character must be immediately preceded and followed
+         by a letter or number. Required.
+        :type container_name: str
+        :param legal_hold: The LegalHold property that will be clear from a blob container. Is either a
+         LegalHold type or a IO[bytes] type. Required.
+        :type legal_hold: ~azure.mgmt.storage.v2024_01_01.models.LegalHold or IO[bytes]
+        :return: LegalHold or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.LegalHold
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _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", self._api_version or "2024-01-01"))
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+        cls: ClsType[_models.LegalHold] = kwargs.pop("cls", None)
+
+        content_type = content_type or "application/json"
+        _json = None
+        _content = None
+        if isinstance(legal_hold, (IOBase, bytes)):
+            _content = legal_hold
+        else:
+            _json = self._serialize.body(legal_hold, "LegalHold")
+
+        _request = build_clear_legal_hold_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            container_name=container_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            content_type=content_type,
+            json=_json,
+            content=_content,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("LegalHold", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @overload
+    def create_or_update_immutability_policy(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        container_name: str,
+        if_match: Optional[str] = None,
+        parameters: Optional[_models.ImmutabilityPolicy] = None,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.ImmutabilityPolicy:
+        """Creates or updates an unlocked immutability policy. ETag in If-Match is honored if given but
+        not required for this operation.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param container_name: The name of the blob container within the specified storage account.
+         Blob container names must be between 3 and 63 characters in length and use numbers, lower-case
+         letters and dash (-) only. Every dash (-) character must be immediately preceded and followed
+         by a letter or number. Required.
+        :type container_name: str
+        :param if_match: The entity state (ETag) version of the immutability policy to update must be
+         returned to the server for all update operations. The ETag value must include the leading and
+         trailing double quotes as returned by the service. Default value is None.
+        :type if_match: str
+        :param parameters: The ImmutabilityPolicy Properties that will be created or updated to a blob
+         container. Default value is None.
+        :type parameters: ~azure.mgmt.storage.v2024_01_01.models.ImmutabilityPolicy
+        :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: ImmutabilityPolicy or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.ImmutabilityPolicy
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @overload
+    def create_or_update_immutability_policy(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        container_name: str,
+        if_match: Optional[str] = None,
+        parameters: Optional[IO[bytes]] = None,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.ImmutabilityPolicy:
+        """Creates or updates an unlocked immutability policy. ETag in If-Match is honored if given but
+        not required for this operation.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param container_name: The name of the blob container within the specified storage account.
+         Blob container names must be between 3 and 63 characters in length and use numbers, lower-case
+         letters and dash (-) only. Every dash (-) character must be immediately preceded and followed
+         by a letter or number. Required.
+        :type container_name: str
+        :param if_match: The entity state (ETag) version of the immutability policy to update must be
+         returned to the server for all update operations. The ETag value must include the leading and
+         trailing double quotes as returned by the service. Default value is None.
+        :type if_match: str
+        :param parameters: The ImmutabilityPolicy Properties that will be created or updated to a blob
+         container. Default value is None.
+        :type parameters: IO[bytes]
+        :keyword content_type: Body Parameter content-type. Content type parameter for binary body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: ImmutabilityPolicy or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.ImmutabilityPolicy
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @distributed_trace
+    def create_or_update_immutability_policy(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        container_name: str,
+        if_match: Optional[str] = None,
+        parameters: Optional[Union[_models.ImmutabilityPolicy, IO[bytes]]] = None,
+        **kwargs: Any
+    ) -> _models.ImmutabilityPolicy:
+        """Creates or updates an unlocked immutability policy. ETag in If-Match is honored if given but
+        not required for this operation.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param container_name: The name of the blob container within the specified storage account.
+         Blob container names must be between 3 and 63 characters in length and use numbers, lower-case
+         letters and dash (-) only. Every dash (-) character must be immediately preceded and followed
+         by a letter or number. Required.
+        :type container_name: str
+        :param if_match: The entity state (ETag) version of the immutability policy to update must be
+         returned to the server for all update operations. The ETag value must include the leading and
+         trailing double quotes as returned by the service. Default value is None.
+        :type if_match: str
+        :param parameters: The ImmutabilityPolicy Properties that will be created or updated to a blob
+         container. Is either a ImmutabilityPolicy type or a IO[bytes] type. Default value is None.
+        :type parameters: ~azure.mgmt.storage.v2024_01_01.models.ImmutabilityPolicy or IO[bytes]
+        :return: ImmutabilityPolicy or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.ImmutabilityPolicy
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        immutability_policy_name: Literal["default"] = kwargs.pop("immutability_policy_name", "default")
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+        cls: ClsType[_models.ImmutabilityPolicy] = kwargs.pop("cls", None)
+
+        content_type = content_type or "application/json"
+        _json = None
+        _content = None
+        if isinstance(parameters, (IOBase, bytes)):
+            _content = parameters
+        else:
+            if parameters is not None:
+                _json = self._serialize.body(parameters, "ImmutabilityPolicy")
+            else:
+                _json = None
+
+        _request = build_create_or_update_immutability_policy_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            container_name=container_name,
+            subscription_id=self._config.subscription_id,
+            if_match=if_match,
+            immutability_policy_name=immutability_policy_name,
+            api_version=api_version,
+            content_type=content_type,
+            json=_json,
+            content=_content,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        response_headers = {}
+        response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
+
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, response_headers)  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @distributed_trace
+    def get_immutability_policy(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        container_name: str,
+        if_match: Optional[str] = None,
+        **kwargs: Any
+    ) -> _models.ImmutabilityPolicy:
+        """Gets the existing immutability policy along with the corresponding ETag in response headers and
+        body.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param container_name: The name of the blob container within the specified storage account.
+         Blob container names must be between 3 and 63 characters in length and use numbers, lower-case
+         letters and dash (-) only. Every dash (-) character must be immediately preceded and followed
+         by a letter or number. Required.
+        :type container_name: str
+        :param if_match: The entity state (ETag) version of the immutability policy to update must be
+         returned to the server for all update operations. The ETag value must include the leading and
+         trailing double quotes as returned by the service. Default value is None.
+        :type if_match: str
+        :return: ImmutabilityPolicy or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.ImmutabilityPolicy
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        immutability_policy_name: Literal["default"] = kwargs.pop("immutability_policy_name", "default")
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.ImmutabilityPolicy] = kwargs.pop("cls", None)
+
+        _request = build_get_immutability_policy_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            container_name=container_name,
+            subscription_id=self._config.subscription_id,
+            if_match=if_match,
+            immutability_policy_name=immutability_policy_name,
+            api_version=api_version,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        response_headers = {}
+        response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
+
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, response_headers)  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @distributed_trace
+    def delete_immutability_policy(
+        self, resource_group_name: str, account_name: str, container_name: str, if_match: str, **kwargs: Any
+    ) -> _models.ImmutabilityPolicy:
+        """Aborts an unlocked immutability policy. The response of delete has
+        immutabilityPeriodSinceCreationInDays set to 0. ETag in If-Match is required for this
+        operation. Deleting a locked immutability policy is not allowed, the only way is to delete the
+        container after deleting all expired blobs inside the policy locked container.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param container_name: The name of the blob container within the specified storage account.
+         Blob container names must be between 3 and 63 characters in length and use numbers, lower-case
+         letters and dash (-) only. Every dash (-) character must be immediately preceded and followed
+         by a letter or number. Required.
+        :type container_name: str
+        :param if_match: The entity state (ETag) version of the immutability policy to update must be
+         returned to the server for all update operations. The ETag value must include the leading and
+         trailing double quotes as returned by the service. Required.
+        :type if_match: str
+        :return: ImmutabilityPolicy or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.ImmutabilityPolicy
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        immutability_policy_name: Literal["default"] = kwargs.pop("immutability_policy_name", "default")
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.ImmutabilityPolicy] = kwargs.pop("cls", None)
+
+        _request = build_delete_immutability_policy_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            container_name=container_name,
+            subscription_id=self._config.subscription_id,
+            if_match=if_match,
+            immutability_policy_name=immutability_policy_name,
+            api_version=api_version,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        response_headers = {}
+        response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
+
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, response_headers)  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @distributed_trace
+    def lock_immutability_policy(
+        self, resource_group_name: str, account_name: str, container_name: str, if_match: str, **kwargs: Any
+    ) -> _models.ImmutabilityPolicy:
+        """Sets the ImmutabilityPolicy to Locked state. The only action allowed on a Locked policy is
+        ExtendImmutabilityPolicy action. ETag in If-Match is required for this operation.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param container_name: The name of the blob container within the specified storage account.
+         Blob container names must be between 3 and 63 characters in length and use numbers, lower-case
+         letters and dash (-) only. Every dash (-) character must be immediately preceded and followed
+         by a letter or number. Required.
+        :type container_name: str
+        :param if_match: The entity state (ETag) version of the immutability policy to update must be
+         returned to the server for all update operations. The ETag value must include the leading and
+         trailing double quotes as returned by the service. Required.
+        :type if_match: str
+        :return: ImmutabilityPolicy or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.ImmutabilityPolicy
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.ImmutabilityPolicy] = kwargs.pop("cls", None)
+
+        _request = build_lock_immutability_policy_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            container_name=container_name,
+            subscription_id=self._config.subscription_id,
+            if_match=if_match,
+            api_version=api_version,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        response_headers = {}
+        response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
+
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, response_headers)  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @overload
+    def extend_immutability_policy(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        container_name: str,
+        if_match: str,
+        parameters: Optional[_models.ImmutabilityPolicy] = None,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.ImmutabilityPolicy:
+        """Extends the immutabilityPeriodSinceCreationInDays of a locked immutabilityPolicy. The only
+        action allowed on a Locked policy will be this action. ETag in If-Match is required for this
+        operation.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param container_name: The name of the blob container within the specified storage account.
+         Blob container names must be between 3 and 63 characters in length and use numbers, lower-case
+         letters and dash (-) only. Every dash (-) character must be immediately preceded and followed
+         by a letter or number. Required.
+        :type container_name: str
+        :param if_match: The entity state (ETag) version of the immutability policy to update must be
+         returned to the server for all update operations. The ETag value must include the leading and
+         trailing double quotes as returned by the service. Required.
+        :type if_match: str
+        :param parameters: The ImmutabilityPolicy Properties that will be extended for a blob
+         container. Default value is None.
+        :type parameters: ~azure.mgmt.storage.v2024_01_01.models.ImmutabilityPolicy
+        :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: ImmutabilityPolicy or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.ImmutabilityPolicy
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @overload
+    def extend_immutability_policy(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        container_name: str,
+        if_match: str,
+        parameters: Optional[IO[bytes]] = None,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.ImmutabilityPolicy:
+        """Extends the immutabilityPeriodSinceCreationInDays of a locked immutabilityPolicy. The only
+        action allowed on a Locked policy will be this action. ETag in If-Match is required for this
+        operation.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param container_name: The name of the blob container within the specified storage account.
+         Blob container names must be between 3 and 63 characters in length and use numbers, lower-case
+         letters and dash (-) only. Every dash (-) character must be immediately preceded and followed
+         by a letter or number. Required.
+        :type container_name: str
+        :param if_match: The entity state (ETag) version of the immutability policy to update must be
+         returned to the server for all update operations. The ETag value must include the leading and
+         trailing double quotes as returned by the service. Required.
+        :type if_match: str
+        :param parameters: The ImmutabilityPolicy Properties that will be extended for a blob
+         container. Default value is None.
+        :type parameters: IO[bytes]
+        :keyword content_type: Body Parameter content-type. Content type parameter for binary body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: ImmutabilityPolicy or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.ImmutabilityPolicy
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @distributed_trace
+    def extend_immutability_policy(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        container_name: str,
+        if_match: str,
+        parameters: Optional[Union[_models.ImmutabilityPolicy, IO[bytes]]] = None,
+        **kwargs: Any
+    ) -> _models.ImmutabilityPolicy:
+        """Extends the immutabilityPeriodSinceCreationInDays of a locked immutabilityPolicy. The only
+        action allowed on a Locked policy will be this action. ETag in If-Match is required for this
+        operation.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param container_name: The name of the blob container within the specified storage account.
+         Blob container names must be between 3 and 63 characters in length and use numbers, lower-case
+         letters and dash (-) only. Every dash (-) character must be immediately preceded and followed
+         by a letter or number. Required.
+        :type container_name: str
+        :param if_match: The entity state (ETag) version of the immutability policy to update must be
+         returned to the server for all update operations. The ETag value must include the leading and
+         trailing double quotes as returned by the service. Required.
+        :type if_match: str
+        :param parameters: The ImmutabilityPolicy Properties that will be extended for a blob
+         container. Is either a ImmutabilityPolicy type or a IO[bytes] type. Default value is None.
+        :type parameters: ~azure.mgmt.storage.v2024_01_01.models.ImmutabilityPolicy or IO[bytes]
+        :return: ImmutabilityPolicy or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.ImmutabilityPolicy
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _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", self._api_version or "2024-01-01"))
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+        cls: ClsType[_models.ImmutabilityPolicy] = kwargs.pop("cls", None)
+
+        content_type = content_type or "application/json"
+        _json = None
+        _content = None
+        if isinstance(parameters, (IOBase, bytes)):
+            _content = parameters
+        else:
+            if parameters is not None:
+                _json = self._serialize.body(parameters, "ImmutabilityPolicy")
+            else:
+                _json = None
+
+        _request = build_extend_immutability_policy_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            container_name=container_name,
+            subscription_id=self._config.subscription_id,
+            if_match=if_match,
+            api_version=api_version,
+            content_type=content_type,
+            json=_json,
+            content=_content,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        response_headers = {}
+        response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
+
+        deserialized = self._deserialize("ImmutabilityPolicy", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, response_headers)  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @overload
+    def lease(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        container_name: str,
+        parameters: Optional[_models.LeaseContainerRequest] = None,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.LeaseContainerResponse:
+        """The Lease Container operation establishes and manages a lock on a container for delete
+        operations. The lock duration can be 15 to 60 seconds, or can be infinite.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param container_name: The name of the blob container within the specified storage account.
+         Blob container names must be between 3 and 63 characters in length and use numbers, lower-case
+         letters and dash (-) only. Every dash (-) character must be immediately preceded and followed
+         by a letter or number. Required.
+        :type container_name: str
+        :param parameters: Lease Container request body. Default value is None.
+        :type parameters: ~azure.mgmt.storage.v2024_01_01.models.LeaseContainerRequest
+        :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: LeaseContainerResponse or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.LeaseContainerResponse
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @overload
+    def lease(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        container_name: str,
+        parameters: Optional[IO[bytes]] = None,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.LeaseContainerResponse:
+        """The Lease Container operation establishes and manages a lock on a container for delete
+        operations. The lock duration can be 15 to 60 seconds, or can be infinite.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param container_name: The name of the blob container within the specified storage account.
+         Blob container names must be between 3 and 63 characters in length and use numbers, lower-case
+         letters and dash (-) only. Every dash (-) character must be immediately preceded and followed
+         by a letter or number. Required.
+        :type container_name: str
+        :param parameters: Lease Container request body. Default value is None.
+        :type parameters: IO[bytes]
+        :keyword content_type: Body Parameter content-type. Content type parameter for binary body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: LeaseContainerResponse or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.LeaseContainerResponse
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @distributed_trace
+    def lease(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        container_name: str,
+        parameters: Optional[Union[_models.LeaseContainerRequest, IO[bytes]]] = None,
+        **kwargs: Any
+    ) -> _models.LeaseContainerResponse:
+        """The Lease Container operation establishes and manages a lock on a container for delete
+        operations. The lock duration can be 15 to 60 seconds, or can be infinite.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param container_name: The name of the blob container within the specified storage account.
+         Blob container names must be between 3 and 63 characters in length and use numbers, lower-case
+         letters and dash (-) only. Every dash (-) character must be immediately preceded and followed
+         by a letter or number. Required.
+        :type container_name: str
+        :param parameters: Lease Container request body. Is either a LeaseContainerRequest type or a
+         IO[bytes] type. Default value is None.
+        :type parameters: ~azure.mgmt.storage.v2024_01_01.models.LeaseContainerRequest or IO[bytes]
+        :return: LeaseContainerResponse or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.LeaseContainerResponse
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _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", self._api_version or "2024-01-01"))
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+        cls: ClsType[_models.LeaseContainerResponse] = kwargs.pop("cls", None)
+
+        content_type = content_type or "application/json"
+        _json = None
+        _content = None
+        if isinstance(parameters, (IOBase, bytes)):
+            _content = parameters
+        else:
+            if parameters is not None:
+                _json = self._serialize.body(parameters, "LeaseContainerRequest")
+            else:
+                _json = None
+
+        _request = build_lease_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            container_name=container_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            content_type=content_type,
+            json=_json,
+            content=_content,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("LeaseContainerResponse", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    def _object_level_worm_initial(
+        self, resource_group_name: str, account_name: str, container_name: str, **kwargs: Any
+    ) -> Iterator[bytes]:
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
+
+        _request = build_object_level_worm_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            container_name=container_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
+        pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200, 202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @distributed_trace
+    def begin_object_level_worm(
+        self, resource_group_name: str, account_name: str, container_name: str, **kwargs: Any
+    ) -> LROPoller[None]:
+        """This operation migrates a blob container from container level WORM to object level immutability
+        enabled container. Prerequisites require a container level immutability policy either in locked
+        or unlocked state, Account level versioning must be enabled and there should be no Legal hold
+        on the container.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param container_name: The name of the blob container within the specified storage account.
+         Blob container names must be between 3 and 63 characters in length and use numbers, lower-case
+         letters and dash (-) only. Every dash (-) character must be immediately preceded and followed
+         by a letter or number. Required.
+        :type container_name: str
+        :return: An instance of LROPoller that returns either None or the result of cls(response)
+        :rtype: ~azure.core.polling.LROPoller[None]
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[None] = kwargs.pop("cls", None)
+        polling: Union[bool, PollingMethod] = kwargs.pop("polling", True)
+        lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
+        cont_token: Optional[str] = kwargs.pop("continuation_token", None)
+        if cont_token is None:
+            raw_result = self._object_level_worm_initial(
+                resource_group_name=resource_group_name,
+                account_name=account_name,
+                container_name=container_name,
+                api_version=api_version,
+                cls=lambda x, y, z: x,
+                headers=_headers,
+                params=_params,
+                **kwargs
+            )
+            raw_result.http_response.read()  # type: ignore
+        kwargs.pop("error_map", None)
+
+        def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
+            if cls:
+                return cls(pipeline_response, None, {})  # type: ignore
+
+        if polling is True:
+            polling_method: PollingMethod = cast(
+                PollingMethod, ARMPolling(lro_delay, lro_options={"final-state-via": "location"}, **kwargs)
+            )
+        elif polling is False:
+            polling_method = cast(PollingMethod, NoPolling())
+        else:
+            polling_method = polling
+        if cont_token:
+            return LROPoller[None].from_continuation_token(
+                polling_method=polling_method,
+                continuation_token=cont_token,
+                client=self._client,
+                deserialization_callback=get_long_running_output,
+            )
+        return LROPoller[None](self._client, raw_result, get_long_running_output, polling_method)  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/operations/_blob_inventory_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/operations/_blob_inventory_policies_operations.py
new file mode 100644
index 000000000000..66b5ed08fe5c
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/operations/_blob_inventory_policies_operations.py
@@ -0,0 +1,587 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+from io import IOBase
+import sys
+from typing import Any, Callable, Dict, IO, Iterable, Optional, TypeVar, Union, overload
+import urllib.parse
+
+from azure.core.exceptions import (
+    ClientAuthenticationError,
+    HttpResponseError,
+    ResourceExistsError,
+    ResourceNotFoundError,
+    ResourceNotModifiedError,
+    map_error,
+)
+from azure.core.paging import ItemPaged
+from azure.core.pipeline import PipelineResponse
+from azure.core.rest import HttpRequest, HttpResponse
+from azure.core.tracing.decorator import distributed_trace
+from azure.core.utils import case_insensitive_dict
+from azure.mgmt.core.exceptions import ARMErrorFormat
+
+from .. import models as _models
+from ..._serialization import Serializer
+
+if sys.version_info >= (3, 9):
+    from collections.abc import MutableMapping
+else:
+    from typing import MutableMapping  # type: ignore
+T = TypeVar("T")
+ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
+
+_SERIALIZER = Serializer()
+_SERIALIZER.client_side_validation = False
+
+
+def build_get_request(
+    resource_group_name: str,
+    account_name: str,
+    blob_inventory_policy_name: Union[str, _models.BlobInventoryPolicyName],
+    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-01-01"))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/inventoryPolicies/{blobInventoryPolicyName}",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+        "blobInventoryPolicyName": _SERIALIZER.url("blob_inventory_policy_name", blob_inventory_policy_name, "str"),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+def build_create_or_update_request(
+    resource_group_name: str,
+    account_name: str,
+    blob_inventory_policy_name: Union[str, _models.BlobInventoryPolicyName],
+    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-01-01"))
+    content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/inventoryPolicies/{blobInventoryPolicyName}",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+        "blobInventoryPolicyName": _SERIALIZER.url("blob_inventory_policy_name", blob_inventory_policy_name, "str"),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    if content_type is not None:
+        _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str")
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="PUT", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+def build_delete_request(
+    resource_group_name: str,
+    account_name: str,
+    blob_inventory_policy_name: Union[str, _models.BlobInventoryPolicyName],
+    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-01-01"))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/inventoryPolicies/{blobInventoryPolicyName}",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+        "blobInventoryPolicyName": _SERIALIZER.url("blob_inventory_policy_name", blob_inventory_policy_name, "str"),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="DELETE", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+def build_list_request(resource_group_name: str, account_name: str, 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-01-01"))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/inventoryPolicies",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+class BlobInventoryPoliciesOperations:
+    """
+    .. warning::
+        **DO NOT** instantiate this class directly.
+
+        Instead, you should access the following operations through
+        :class:`~azure.mgmt.storage.v2024_01_01.StorageManagementClient`'s
+        :attr:`blob_inventory_policies` attribute.
+    """
+
+    models = _models
+
+    def __init__(self, *args, **kwargs):
+        input_args = list(args)
+        self._client = input_args.pop(0) if input_args else kwargs.pop("client")
+        self._config = input_args.pop(0) if input_args else kwargs.pop("config")
+        self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer")
+        self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer")
+        self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version")
+
+    @distributed_trace
+    def get(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        blob_inventory_policy_name: Union[str, _models.BlobInventoryPolicyName],
+        **kwargs: Any
+    ) -> _models.BlobInventoryPolicy:
+        """Gets the blob inventory policy associated with the specified storage account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param blob_inventory_policy_name: The name of the storage account blob inventory policy. It
+         should always be 'default'. "default" Required.
+        :type blob_inventory_policy_name: str or
+         ~azure.mgmt.storage.v2024_01_01.models.BlobInventoryPolicyName
+        :return: BlobInventoryPolicy or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.BlobInventoryPolicy
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.BlobInventoryPolicy] = kwargs.pop("cls", None)
+
+        _request = build_get_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            blob_inventory_policy_name=blob_inventory_policy_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @overload
+    def create_or_update(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        blob_inventory_policy_name: Union[str, _models.BlobInventoryPolicyName],
+        properties: _models.BlobInventoryPolicy,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.BlobInventoryPolicy:
+        """Sets the blob inventory policy to the specified storage account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param blob_inventory_policy_name: The name of the storage account blob inventory policy. It
+         should always be 'default'. "default" Required.
+        :type blob_inventory_policy_name: str or
+         ~azure.mgmt.storage.v2024_01_01.models.BlobInventoryPolicyName
+        :param properties: The blob inventory policy set to a storage account. Required.
+        :type properties: ~azure.mgmt.storage.v2024_01_01.models.BlobInventoryPolicy
+        :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: BlobInventoryPolicy or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.BlobInventoryPolicy
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @overload
+    def create_or_update(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        blob_inventory_policy_name: Union[str, _models.BlobInventoryPolicyName],
+        properties: IO[bytes],
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.BlobInventoryPolicy:
+        """Sets the blob inventory policy to the specified storage account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param blob_inventory_policy_name: The name of the storage account blob inventory policy. It
+         should always be 'default'. "default" Required.
+        :type blob_inventory_policy_name: str or
+         ~azure.mgmt.storage.v2024_01_01.models.BlobInventoryPolicyName
+        :param properties: The blob inventory policy set to a storage account. Required.
+        :type properties: IO[bytes]
+        :keyword content_type: Body Parameter content-type. Content type parameter for binary body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: BlobInventoryPolicy or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.BlobInventoryPolicy
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @distributed_trace
+    def create_or_update(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        blob_inventory_policy_name: Union[str, _models.BlobInventoryPolicyName],
+        properties: Union[_models.BlobInventoryPolicy, IO[bytes]],
+        **kwargs: Any
+    ) -> _models.BlobInventoryPolicy:
+        """Sets the blob inventory policy to the specified storage account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param blob_inventory_policy_name: The name of the storage account blob inventory policy. It
+         should always be 'default'. "default" Required.
+        :type blob_inventory_policy_name: str or
+         ~azure.mgmt.storage.v2024_01_01.models.BlobInventoryPolicyName
+        :param properties: The blob inventory policy set to a storage account. Is either a
+         BlobInventoryPolicy type or a IO[bytes] type. Required.
+        :type properties: ~azure.mgmt.storage.v2024_01_01.models.BlobInventoryPolicy or IO[bytes]
+        :return: BlobInventoryPolicy or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.BlobInventoryPolicy
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _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", self._api_version or "2024-01-01"))
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+        cls: ClsType[_models.BlobInventoryPolicy] = kwargs.pop("cls", None)
+
+        content_type = content_type or "application/json"
+        _json = None
+        _content = None
+        if isinstance(properties, (IOBase, bytes)):
+            _content = properties
+        else:
+            _json = self._serialize.body(properties, "BlobInventoryPolicy")
+
+        _request = build_create_or_update_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            blob_inventory_policy_name=blob_inventory_policy_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            content_type=content_type,
+            json=_json,
+            content=_content,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("BlobInventoryPolicy", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @distributed_trace
+    def delete(  # pylint: disable=inconsistent-return-statements
+        self,
+        resource_group_name: str,
+        account_name: str,
+        blob_inventory_policy_name: Union[str, _models.BlobInventoryPolicyName],
+        **kwargs: Any
+    ) -> None:
+        """Deletes the blob inventory policy associated with the specified storage account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param blob_inventory_policy_name: The name of the storage account blob inventory policy. It
+         should always be 'default'. "default" Required.
+        :type blob_inventory_policy_name: str or
+         ~azure.mgmt.storage.v2024_01_01.models.BlobInventoryPolicyName
+        :return: None or the result of cls(response)
+        :rtype: None
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[None] = kwargs.pop("cls", None)
+
+        _request = build_delete_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            blob_inventory_policy_name=blob_inventory_policy_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200, 204]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        if cls:
+            return cls(pipeline_response, None, {})  # type: ignore
+
+    @distributed_trace
+    def list(
+        self, resource_group_name: str, account_name: str, **kwargs: Any
+    ) -> Iterable["_models.BlobInventoryPolicy"]:
+        """Gets the blob inventory policy associated with the specified storage account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :return: An iterator like instance of either BlobInventoryPolicy or the result of cls(response)
+        :rtype:
+         ~azure.core.paging.ItemPaged[~azure.mgmt.storage.v2024_01_01.models.BlobInventoryPolicy]
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.ListBlobInventoryPolicy] = kwargs.pop("cls", None)
+
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        def prepare_request(next_link=None):
+            if not next_link:
+
+                _request = build_list_request(
+                    resource_group_name=resource_group_name,
+                    account_name=account_name,
+                    subscription_id=self._config.subscription_id,
+                    api_version=api_version,
+                    headers=_headers,
+                    params=_params,
+                )
+                _request.url = self._client.format_url(_request.url)
+
+            else:
+                # make call to next link with the client's api-version
+                _parsed_next_link = urllib.parse.urlparse(next_link)
+                _next_request_params = case_insensitive_dict(
+                    {
+                        key: [urllib.parse.quote(v) for v in value]
+                        for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items()
+                    }
+                )
+                _next_request_params["api-version"] = self._api_version
+                _request = HttpRequest(
+                    "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
+                )
+                _request.url = self._client.format_url(_request.url)
+                _request.method = "GET"
+            return _request
+
+        def extract_data(pipeline_response):
+            deserialized = self._deserialize("ListBlobInventoryPolicy", pipeline_response)
+            list_of_elem = deserialized.value
+            if cls:
+                list_of_elem = cls(list_of_elem)  # type: ignore
+            return None, iter(list_of_elem)
+
+        def get_next(next_link=None):
+            _request = prepare_request(next_link)
+
+            _stream = False
+            pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+                _request, stream=_stream, **kwargs
+            )
+            response = pipeline_response.http_response
+
+            if response.status_code not in [200]:
+                map_error(status_code=response.status_code, response=response, error_map=error_map)
+                error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
+                raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
+
+            return pipeline_response
+
+        return ItemPaged(get_next, extract_data)
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/operations/_blob_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/operations/_blob_services_operations.py
new file mode 100644
index 000000000000..5e0f1aa981ec
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/operations/_blob_services_operations.py
@@ -0,0 +1,463 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+from io import IOBase
+import sys
+from typing import Any, Callable, Dict, IO, Iterable, Literal, Optional, TypeVar, Union, overload
+import urllib.parse
+
+from azure.core.exceptions import (
+    ClientAuthenticationError,
+    HttpResponseError,
+    ResourceExistsError,
+    ResourceNotFoundError,
+    ResourceNotModifiedError,
+    map_error,
+)
+from azure.core.paging import ItemPaged
+from azure.core.pipeline import PipelineResponse
+from azure.core.rest import HttpRequest, HttpResponse
+from azure.core.tracing.decorator import distributed_trace
+from azure.core.utils import case_insensitive_dict
+from azure.mgmt.core.exceptions import ARMErrorFormat
+
+from .. import models as _models
+from ..._serialization import Serializer
+
+if sys.version_info >= (3, 9):
+    from collections.abc import MutableMapping
+else:
+    from typing import MutableMapping  # type: ignore
+T = TypeVar("T")
+ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
+
+_SERIALIZER = Serializer()
+_SERIALIZER.client_side_validation = False
+
+
+def build_list_request(resource_group_name: str, account_name: str, 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-01-01"))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/blobServices",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+def build_set_service_properties_request(
+    resource_group_name: str, account_name: str, 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-01-01"))
+    blob_services_name: Literal["default"] = kwargs.pop("blob_services_name", "default")
+    content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/blobServices/{BlobServicesName}",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+        "BlobServicesName": _SERIALIZER.url("blob_services_name", blob_services_name, "str"),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    if content_type is not None:
+        _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str")
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="PUT", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+def build_get_service_properties_request(
+    resource_group_name: str, account_name: str, 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-01-01"))
+    blob_services_name: Literal["default"] = kwargs.pop("blob_services_name", "default")
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/blobServices/{BlobServicesName}",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+        "BlobServicesName": _SERIALIZER.url("blob_services_name", blob_services_name, "str"),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+class BlobServicesOperations:
+    """
+    .. warning::
+        **DO NOT** instantiate this class directly.
+
+        Instead, you should access the following operations through
+        :class:`~azure.mgmt.storage.v2024_01_01.StorageManagementClient`'s
+        :attr:`blob_services` attribute.
+    """
+
+    models = _models
+
+    def __init__(self, *args, **kwargs):
+        input_args = list(args)
+        self._client = input_args.pop(0) if input_args else kwargs.pop("client")
+        self._config = input_args.pop(0) if input_args else kwargs.pop("config")
+        self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer")
+        self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer")
+        self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version")
+
+    @distributed_trace
+    def list(
+        self, resource_group_name: str, account_name: str, **kwargs: Any
+    ) -> Iterable["_models.BlobServiceProperties"]:
+        """List blob services of storage account. It returns a collection of one object named default.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :return: An iterator like instance of either BlobServiceProperties or the result of
+         cls(response)
+        :rtype:
+         ~azure.core.paging.ItemPaged[~azure.mgmt.storage.v2024_01_01.models.BlobServiceProperties]
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.BlobServiceItems] = kwargs.pop("cls", None)
+
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        def prepare_request(next_link=None):
+            if not next_link:
+
+                _request = build_list_request(
+                    resource_group_name=resource_group_name,
+                    account_name=account_name,
+                    subscription_id=self._config.subscription_id,
+                    api_version=api_version,
+                    headers=_headers,
+                    params=_params,
+                )
+                _request.url = self._client.format_url(_request.url)
+
+            else:
+                # make call to next link with the client's api-version
+                _parsed_next_link = urllib.parse.urlparse(next_link)
+                _next_request_params = case_insensitive_dict(
+                    {
+                        key: [urllib.parse.quote(v) for v in value]
+                        for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items()
+                    }
+                )
+                _next_request_params["api-version"] = self._api_version
+                _request = HttpRequest(
+                    "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
+                )
+                _request.url = self._client.format_url(_request.url)
+                _request.method = "GET"
+            return _request
+
+        def extract_data(pipeline_response):
+            deserialized = self._deserialize("BlobServiceItems", pipeline_response)
+            list_of_elem = deserialized.value
+            if cls:
+                list_of_elem = cls(list_of_elem)  # type: ignore
+            return None, iter(list_of_elem)
+
+        def get_next(next_link=None):
+            _request = prepare_request(next_link)
+
+            _stream = False
+            pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+                _request, stream=_stream, **kwargs
+            )
+            response = pipeline_response.http_response
+
+            if response.status_code not in [200]:
+                map_error(status_code=response.status_code, response=response, error_map=error_map)
+                raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+            return pipeline_response
+
+        return ItemPaged(get_next, extract_data)
+
+    @overload
+    def set_service_properties(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        parameters: _models.BlobServiceProperties,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.BlobServiceProperties:
+        """Sets the properties of a storage account’s Blob service, including properties for Storage
+        Analytics and CORS (Cross-Origin Resource Sharing) rules.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param parameters: The properties of a storage account’s Blob service, including properties for
+         Storage Analytics and CORS (Cross-Origin Resource Sharing) rules. Required.
+        :type parameters: ~azure.mgmt.storage.v2024_01_01.models.BlobServiceProperties
+        :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: BlobServiceProperties or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.BlobServiceProperties
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @overload
+    def set_service_properties(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        parameters: IO[bytes],
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.BlobServiceProperties:
+        """Sets the properties of a storage account’s Blob service, including properties for Storage
+        Analytics and CORS (Cross-Origin Resource Sharing) rules.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param parameters: The properties of a storage account’s Blob service, including properties for
+         Storage Analytics and CORS (Cross-Origin Resource Sharing) rules. Required.
+        :type parameters: IO[bytes]
+        :keyword content_type: Body Parameter content-type. Content type parameter for binary body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: BlobServiceProperties or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.BlobServiceProperties
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @distributed_trace
+    def set_service_properties(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        parameters: Union[_models.BlobServiceProperties, IO[bytes]],
+        **kwargs: Any
+    ) -> _models.BlobServiceProperties:
+        """Sets the properties of a storage account’s Blob service, including properties for Storage
+        Analytics and CORS (Cross-Origin Resource Sharing) rules.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param parameters: The properties of a storage account’s Blob service, including properties for
+         Storage Analytics and CORS (Cross-Origin Resource Sharing) rules. Is either a
+         BlobServiceProperties type or a IO[bytes] type. Required.
+        :type parameters: ~azure.mgmt.storage.v2024_01_01.models.BlobServiceProperties or IO[bytes]
+        :return: BlobServiceProperties or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.BlobServiceProperties
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _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", self._api_version or "2024-01-01"))
+        blob_services_name: Literal["default"] = kwargs.pop("blob_services_name", "default")
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+        cls: ClsType[_models.BlobServiceProperties] = kwargs.pop("cls", None)
+
+        content_type = content_type or "application/json"
+        _json = None
+        _content = None
+        if isinstance(parameters, (IOBase, bytes)):
+            _content = parameters
+        else:
+            _json = self._serialize.body(parameters, "BlobServiceProperties")
+
+        _request = build_set_service_properties_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            blob_services_name=blob_services_name,
+            content_type=content_type,
+            json=_json,
+            content=_content,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("BlobServiceProperties", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @distributed_trace
+    def get_service_properties(
+        self, resource_group_name: str, account_name: str, **kwargs: Any
+    ) -> _models.BlobServiceProperties:
+        """Gets the properties of a storage account’s Blob service, including properties for Storage
+        Analytics and CORS (Cross-Origin Resource Sharing) rules.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :return: BlobServiceProperties or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.BlobServiceProperties
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        blob_services_name: Literal["default"] = kwargs.pop("blob_services_name", "default")
+        cls: ClsType[_models.BlobServiceProperties] = kwargs.pop("cls", None)
+
+        _request = build_get_service_properties_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            blob_services_name=blob_services_name,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("BlobServiceProperties", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/operations/_deleted_accounts_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/operations/_deleted_accounts_operations.py
new file mode 100644
index 000000000000..9330ce743d34
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/operations/_deleted_accounts_operations.py
@@ -0,0 +1,244 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+import sys
+from typing import Any, Callable, Dict, Iterable, Optional, TypeVar
+import urllib.parse
+
+from azure.core.exceptions import (
+    ClientAuthenticationError,
+    HttpResponseError,
+    ResourceExistsError,
+    ResourceNotFoundError,
+    ResourceNotModifiedError,
+    map_error,
+)
+from azure.core.paging import ItemPaged
+from azure.core.pipeline import PipelineResponse
+from azure.core.rest import HttpRequest, HttpResponse
+from azure.core.tracing.decorator import distributed_trace
+from azure.core.utils import case_insensitive_dict
+from azure.mgmt.core.exceptions import ARMErrorFormat
+
+from .. import models as _models
+from ..._serialization import Serializer
+
+if sys.version_info >= (3, 9):
+    from collections.abc import MutableMapping
+else:
+    from typing import MutableMapping  # type: ignore
+T = TypeVar("T")
+ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
+
+_SERIALIZER = Serializer()
+_SERIALIZER.client_side_validation = False
+
+
+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-01-01"))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/providers/Microsoft.Storage/deletedAccounts")
+    path_format_arguments = {
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+def build_get_request(deleted_account_name: str, location: str, 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-01-01"))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/providers/Microsoft.Storage/locations/{location}/deletedAccounts/{deletedAccountName}",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "deletedAccountName": _SERIALIZER.url(
+            "deleted_account_name", deleted_account_name, "str", max_length=24, min_length=3
+        ),
+        "location": _SERIALIZER.url("location", location, "str"),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+class DeletedAccountsOperations:
+    """
+    .. warning::
+        **DO NOT** instantiate this class directly.
+
+        Instead, you should access the following operations through
+        :class:`~azure.mgmt.storage.v2024_01_01.StorageManagementClient`'s
+        :attr:`deleted_accounts` attribute.
+    """
+
+    models = _models
+
+    def __init__(self, *args, **kwargs):
+        input_args = list(args)
+        self._client = input_args.pop(0) if input_args else kwargs.pop("client")
+        self._config = input_args.pop(0) if input_args else kwargs.pop("config")
+        self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer")
+        self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer")
+        self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version")
+
+    @distributed_trace
+    def list(self, **kwargs: Any) -> Iterable["_models.DeletedAccount"]:
+        """Lists deleted accounts under the subscription.
+
+        :return: An iterator like instance of either DeletedAccount or the result of cls(response)
+        :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.storage.v2024_01_01.models.DeletedAccount]
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.DeletedAccountListResult] = kwargs.pop("cls", None)
+
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        def prepare_request(next_link=None):
+            if not next_link:
+
+                _request = build_list_request(
+                    subscription_id=self._config.subscription_id,
+                    api_version=api_version,
+                    headers=_headers,
+                    params=_params,
+                )
+                _request.url = self._client.format_url(_request.url)
+
+            else:
+                # make call to next link with the client's api-version
+                _parsed_next_link = urllib.parse.urlparse(next_link)
+                _next_request_params = case_insensitive_dict(
+                    {
+                        key: [urllib.parse.quote(v) for v in value]
+                        for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items()
+                    }
+                )
+                _next_request_params["api-version"] = self._api_version
+                _request = HttpRequest(
+                    "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
+                )
+                _request.url = self._client.format_url(_request.url)
+                _request.method = "GET"
+            return _request
+
+        def extract_data(pipeline_response):
+            deserialized = self._deserialize("DeletedAccountListResult", pipeline_response)
+            list_of_elem = deserialized.value
+            if cls:
+                list_of_elem = cls(list_of_elem)  # type: ignore
+            return deserialized.next_link or None, iter(list_of_elem)
+
+        def get_next(next_link=None):
+            _request = prepare_request(next_link)
+
+            _stream = False
+            pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+                _request, stream=_stream, **kwargs
+            )
+            response = pipeline_response.http_response
+
+            if response.status_code not in [200]:
+                map_error(status_code=response.status_code, response=response, error_map=error_map)
+                error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
+                raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
+
+            return pipeline_response
+
+        return ItemPaged(get_next, extract_data)
+
+    @distributed_trace
+    def get(self, deleted_account_name: str, location: str, **kwargs: Any) -> _models.DeletedAccount:
+        """Get properties of specified deleted account resource.
+
+        :param deleted_account_name: Name of the deleted storage account. Required.
+        :type deleted_account_name: str
+        :param location: The location of the deleted storage account. Required.
+        :type location: str
+        :return: DeletedAccount or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.DeletedAccount
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.DeletedAccount] = kwargs.pop("cls", None)
+
+        _request = build_get_request(
+            deleted_account_name=deleted_account_name,
+            location=location,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
+            raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("DeletedAccount", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/operations/_encryption_scopes_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/operations/_encryption_scopes_operations.py
new file mode 100644
index 000000000000..c5d7fd18bf85
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/operations/_encryption_scopes_operations.py
@@ -0,0 +1,720 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+from io import IOBase
+import sys
+from typing import Any, Callable, Dict, IO, Iterable, Optional, TypeVar, Union, overload
+import urllib.parse
+
+from azure.core.exceptions import (
+    ClientAuthenticationError,
+    HttpResponseError,
+    ResourceExistsError,
+    ResourceNotFoundError,
+    ResourceNotModifiedError,
+    map_error,
+)
+from azure.core.paging import ItemPaged
+from azure.core.pipeline import PipelineResponse
+from azure.core.rest import HttpRequest, HttpResponse
+from azure.core.tracing.decorator import distributed_trace
+from azure.core.utils import case_insensitive_dict
+from azure.mgmt.core.exceptions import ARMErrorFormat
+
+from .. import models as _models
+from ..._serialization import Serializer
+
+if sys.version_info >= (3, 9):
+    from collections.abc import MutableMapping
+else:
+    from typing import MutableMapping  # type: ignore
+T = TypeVar("T")
+ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
+
+_SERIALIZER = Serializer()
+_SERIALIZER.client_side_validation = False
+
+
+def build_put_request(
+    resource_group_name: str, account_name: str, encryption_scope_name: str, 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-01-01"))
+    content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/encryptionScopes/{encryptionScopeName}",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+        "encryptionScopeName": _SERIALIZER.url(
+            "encryption_scope_name", encryption_scope_name, "str", max_length=63, min_length=3
+        ),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    if content_type is not None:
+        _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str")
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="PUT", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+def build_patch_request(
+    resource_group_name: str, account_name: str, encryption_scope_name: str, 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-01-01"))
+    content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/encryptionScopes/{encryptionScopeName}",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+        "encryptionScopeName": _SERIALIZER.url(
+            "encryption_scope_name", encryption_scope_name, "str", max_length=63, min_length=3
+        ),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    if content_type is not None:
+        _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str")
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="PATCH", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+def build_get_request(
+    resource_group_name: str, account_name: str, encryption_scope_name: str, 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-01-01"))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/encryptionScopes/{encryptionScopeName}",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+        "encryptionScopeName": _SERIALIZER.url(
+            "encryption_scope_name", encryption_scope_name, "str", max_length=63, min_length=3
+        ),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+def build_list_request(
+    resource_group_name: str,
+    account_name: str,
+    subscription_id: str,
+    *,
+    maxpagesize: Optional[int] = None,
+    filter: Optional[str] = None,
+    include: Optional[Union[str, _models.ListEncryptionScopesInclude]] = None,
+    **kwargs: Any
+) -> HttpRequest:
+    _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
+    _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-01-01"))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/encryptionScopes",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+    if maxpagesize is not None:
+        _params["$maxpagesize"] = _SERIALIZER.query("maxpagesize", maxpagesize, "int", maximum=5000, minimum=1)
+    if filter is not None:
+        _params["$filter"] = _SERIALIZER.query("filter", filter, "str")
+    if include is not None:
+        _params["$include"] = _SERIALIZER.query("include", include, "str")
+
+    # Construct headers
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+class EncryptionScopesOperations:
+    """
+    .. warning::
+        **DO NOT** instantiate this class directly.
+
+        Instead, you should access the following operations through
+        :class:`~azure.mgmt.storage.v2024_01_01.StorageManagementClient`'s
+        :attr:`encryption_scopes` attribute.
+    """
+
+    models = _models
+
+    def __init__(self, *args, **kwargs):
+        input_args = list(args)
+        self._client = input_args.pop(0) if input_args else kwargs.pop("client")
+        self._config = input_args.pop(0) if input_args else kwargs.pop("config")
+        self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer")
+        self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer")
+        self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version")
+
+    @overload
+    def put(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        encryption_scope_name: str,
+        encryption_scope: _models.EncryptionScope,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.EncryptionScope:
+        """Synchronously creates or updates an encryption scope under the specified storage account. If an
+        encryption scope is already created and a subsequent request is issued with different
+        properties, the encryption scope properties will be updated per the specified request.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param encryption_scope_name: The name of the encryption scope within the specified storage
+         account. Encryption scope names must be between 3 and 63 characters in length and use numbers,
+         lower-case letters and dash (-) only. Every dash (-) character must be immediately preceded and
+         followed by a letter or number. Required.
+        :type encryption_scope_name: str
+        :param encryption_scope: Encryption scope properties to be used for the create or update.
+         Required.
+        :type encryption_scope: ~azure.mgmt.storage.v2024_01_01.models.EncryptionScope
+        :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: EncryptionScope or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.EncryptionScope
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @overload
+    def put(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        encryption_scope_name: str,
+        encryption_scope: IO[bytes],
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.EncryptionScope:
+        """Synchronously creates or updates an encryption scope under the specified storage account. If an
+        encryption scope is already created and a subsequent request is issued with different
+        properties, the encryption scope properties will be updated per the specified request.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param encryption_scope_name: The name of the encryption scope within the specified storage
+         account. Encryption scope names must be between 3 and 63 characters in length and use numbers,
+         lower-case letters and dash (-) only. Every dash (-) character must be immediately preceded and
+         followed by a letter or number. Required.
+        :type encryption_scope_name: str
+        :param encryption_scope: Encryption scope properties to be used for the create or update.
+         Required.
+        :type encryption_scope: IO[bytes]
+        :keyword content_type: Body Parameter content-type. Content type parameter for binary body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: EncryptionScope or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.EncryptionScope
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @distributed_trace
+    def put(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        encryption_scope_name: str,
+        encryption_scope: Union[_models.EncryptionScope, IO[bytes]],
+        **kwargs: Any
+    ) -> _models.EncryptionScope:
+        """Synchronously creates or updates an encryption scope under the specified storage account. If an
+        encryption scope is already created and a subsequent request is issued with different
+        properties, the encryption scope properties will be updated per the specified request.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param encryption_scope_name: The name of the encryption scope within the specified storage
+         account. Encryption scope names must be between 3 and 63 characters in length and use numbers,
+         lower-case letters and dash (-) only. Every dash (-) character must be immediately preceded and
+         followed by a letter or number. Required.
+        :type encryption_scope_name: str
+        :param encryption_scope: Encryption scope properties to be used for the create or update. Is
+         either a EncryptionScope type or a IO[bytes] type. Required.
+        :type encryption_scope: ~azure.mgmt.storage.v2024_01_01.models.EncryptionScope or IO[bytes]
+        :return: EncryptionScope or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.EncryptionScope
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _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", self._api_version or "2024-01-01"))
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+        cls: ClsType[_models.EncryptionScope] = kwargs.pop("cls", None)
+
+        content_type = content_type or "application/json"
+        _json = None
+        _content = None
+        if isinstance(encryption_scope, (IOBase, bytes)):
+            _content = encryption_scope
+        else:
+            _json = self._serialize.body(encryption_scope, "EncryptionScope")
+
+        _request = build_put_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            encryption_scope_name=encryption_scope_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            content_type=content_type,
+            json=_json,
+            content=_content,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200, 201]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
+            raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("EncryptionScope", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @overload
+    def patch(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        encryption_scope_name: str,
+        encryption_scope: _models.EncryptionScope,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.EncryptionScope:
+        """Update encryption scope properties as specified in the request body. Update fails if the
+        specified encryption scope does not already exist.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param encryption_scope_name: The name of the encryption scope within the specified storage
+         account. Encryption scope names must be between 3 and 63 characters in length and use numbers,
+         lower-case letters and dash (-) only. Every dash (-) character must be immediately preceded and
+         followed by a letter or number. Required.
+        :type encryption_scope_name: str
+        :param encryption_scope: Encryption scope properties to be used for the update. Required.
+        :type encryption_scope: ~azure.mgmt.storage.v2024_01_01.models.EncryptionScope
+        :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: EncryptionScope or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.EncryptionScope
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @overload
+    def patch(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        encryption_scope_name: str,
+        encryption_scope: IO[bytes],
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.EncryptionScope:
+        """Update encryption scope properties as specified in the request body. Update fails if the
+        specified encryption scope does not already exist.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param encryption_scope_name: The name of the encryption scope within the specified storage
+         account. Encryption scope names must be between 3 and 63 characters in length and use numbers,
+         lower-case letters and dash (-) only. Every dash (-) character must be immediately preceded and
+         followed by a letter or number. Required.
+        :type encryption_scope_name: str
+        :param encryption_scope: Encryption scope properties to be used for the update. Required.
+        :type encryption_scope: IO[bytes]
+        :keyword content_type: Body Parameter content-type. Content type parameter for binary body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: EncryptionScope or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.EncryptionScope
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @distributed_trace
+    def patch(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        encryption_scope_name: str,
+        encryption_scope: Union[_models.EncryptionScope, IO[bytes]],
+        **kwargs: Any
+    ) -> _models.EncryptionScope:
+        """Update encryption scope properties as specified in the request body. Update fails if the
+        specified encryption scope does not already exist.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param encryption_scope_name: The name of the encryption scope within the specified storage
+         account. Encryption scope names must be between 3 and 63 characters in length and use numbers,
+         lower-case letters and dash (-) only. Every dash (-) character must be immediately preceded and
+         followed by a letter or number. Required.
+        :type encryption_scope_name: str
+        :param encryption_scope: Encryption scope properties to be used for the update. Is either a
+         EncryptionScope type or a IO[bytes] type. Required.
+        :type encryption_scope: ~azure.mgmt.storage.v2024_01_01.models.EncryptionScope or IO[bytes]
+        :return: EncryptionScope or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.EncryptionScope
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _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", self._api_version or "2024-01-01"))
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+        cls: ClsType[_models.EncryptionScope] = kwargs.pop("cls", None)
+
+        content_type = content_type or "application/json"
+        _json = None
+        _content = None
+        if isinstance(encryption_scope, (IOBase, bytes)):
+            _content = encryption_scope
+        else:
+            _json = self._serialize.body(encryption_scope, "EncryptionScope")
+
+        _request = build_patch_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            encryption_scope_name=encryption_scope_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            content_type=content_type,
+            json=_json,
+            content=_content,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
+            raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("EncryptionScope", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @distributed_trace
+    def get(
+        self, resource_group_name: str, account_name: str, encryption_scope_name: str, **kwargs: Any
+    ) -> _models.EncryptionScope:
+        """Returns the properties for the specified encryption scope.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param encryption_scope_name: The name of the encryption scope within the specified storage
+         account. Encryption scope names must be between 3 and 63 characters in length and use numbers,
+         lower-case letters and dash (-) only. Every dash (-) character must be immediately preceded and
+         followed by a letter or number. Required.
+        :type encryption_scope_name: str
+        :return: EncryptionScope or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.EncryptionScope
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.EncryptionScope] = kwargs.pop("cls", None)
+
+        _request = build_get_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            encryption_scope_name=encryption_scope_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
+            raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("EncryptionScope", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @distributed_trace
+    def list(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        maxpagesize: Optional[int] = None,
+        filter: Optional[str] = None,
+        include: Optional[Union[str, _models.ListEncryptionScopesInclude]] = None,
+        **kwargs: Any
+    ) -> Iterable["_models.EncryptionScope"]:
+        """Lists all the encryption scopes available under the specified storage account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param maxpagesize: Optional, specifies the maximum number of encryption scopes that will be
+         included in the list response. Default value is None.
+        :type maxpagesize: int
+        :param filter: Optional. When specified, only encryption scope names starting with the filter
+         will be listed. Default value is None.
+        :type filter: str
+        :param include: Optional, when specified, will list encryption scopes with the specific state.
+         Defaults to All. Known values are: "All", "Enabled", and "Disabled". Default value is None.
+        :type include: str or ~azure.mgmt.storage.v2024_01_01.models.ListEncryptionScopesInclude
+        :return: An iterator like instance of either EncryptionScope or the result of cls(response)
+        :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.storage.v2024_01_01.models.EncryptionScope]
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.EncryptionScopeListResult] = kwargs.pop("cls", None)
+
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        def prepare_request(next_link=None):
+            if not next_link:
+
+                _request = build_list_request(
+                    resource_group_name=resource_group_name,
+                    account_name=account_name,
+                    subscription_id=self._config.subscription_id,
+                    maxpagesize=maxpagesize,
+                    filter=filter,
+                    include=include,
+                    api_version=api_version,
+                    headers=_headers,
+                    params=_params,
+                )
+                _request.url = self._client.format_url(_request.url)
+
+            else:
+                # make call to next link with the client's api-version
+                _parsed_next_link = urllib.parse.urlparse(next_link)
+                _next_request_params = case_insensitive_dict(
+                    {
+                        key: [urllib.parse.quote(v) for v in value]
+                        for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items()
+                    }
+                )
+                _next_request_params["api-version"] = self._api_version
+                _request = HttpRequest(
+                    "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
+                )
+                _request.url = self._client.format_url(_request.url)
+                _request.method = "GET"
+            return _request
+
+        def extract_data(pipeline_response):
+            deserialized = self._deserialize("EncryptionScopeListResult", pipeline_response)
+            list_of_elem = deserialized.value
+            if cls:
+                list_of_elem = cls(list_of_elem)  # type: ignore
+            return deserialized.next_link or None, iter(list_of_elem)
+
+        def get_next(next_link=None):
+            _request = prepare_request(next_link)
+
+            _stream = False
+            pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+                _request, stream=_stream, **kwargs
+            )
+            response = pipeline_response.http_response
+
+            if response.status_code not in [200]:
+                map_error(status_code=response.status_code, response=response, error_map=error_map)
+                raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+            return pipeline_response
+
+        return ItemPaged(get_next, extract_data)
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/operations/_file_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/operations/_file_services_operations.py
new file mode 100644
index 000000000000..9f1195b06e97
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/operations/_file_services_operations.py
@@ -0,0 +1,669 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+from io import IOBase
+import sys
+from typing import Any, Callable, Dict, IO, Iterable, Literal, Optional, TypeVar, Union, overload
+import urllib.parse
+
+from azure.core.exceptions import (
+    ClientAuthenticationError,
+    HttpResponseError,
+    ResourceExistsError,
+    ResourceNotFoundError,
+    ResourceNotModifiedError,
+    map_error,
+)
+from azure.core.paging import ItemPaged
+from azure.core.pipeline import PipelineResponse
+from azure.core.rest import HttpRequest, HttpResponse
+from azure.core.tracing.decorator import distributed_trace
+from azure.core.utils import case_insensitive_dict
+from azure.mgmt.core.exceptions import ARMErrorFormat
+
+from .. import models as _models
+from ..._serialization import Serializer
+
+if sys.version_info >= (3, 9):
+    from collections.abc import MutableMapping
+else:
+    from typing import MutableMapping  # type: ignore
+T = TypeVar("T")
+ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
+
+_SERIALIZER = Serializer()
+_SERIALIZER.client_side_validation = False
+
+
+def build_list_request(resource_group_name: str, account_name: str, 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-01-01"))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/fileServices",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+def build_set_service_properties_request(
+    resource_group_name: str, account_name: str, 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-01-01"))
+    file_services_name: Literal["default"] = kwargs.pop("file_services_name", "default")
+    content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/fileServices/{FileServicesName}",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+        "FileServicesName": _SERIALIZER.url("file_services_name", file_services_name, "str"),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    if content_type is not None:
+        _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str")
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="PUT", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+def build_get_service_properties_request(
+    resource_group_name: str, account_name: str, 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-01-01"))
+    file_services_name: Literal["default"] = kwargs.pop("file_services_name", "default")
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/fileServices/{FileServicesName}",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+        "FileServicesName": _SERIALIZER.url("file_services_name", file_services_name, "str"),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+def build_list_service_usages_request(
+    resource_group_name: str,
+    account_name: str,
+    subscription_id: str,
+    *,
+    maxpagesize: Optional[int] = None,
+    **kwargs: Any
+) -> HttpRequest:
+    _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
+    _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-01-01"))
+    file_services_name: Literal["default"] = kwargs.pop("file_services_name", "default")
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/fileServices/{FileServicesName}/usages",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+        "FileServicesName": _SERIALIZER.url("file_services_name", file_services_name, "str"),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+    if maxpagesize is not None:
+        _params["$maxpagesize"] = _SERIALIZER.query("maxpagesize", maxpagesize, "int")
+
+    # Construct headers
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+def build_get_service_usage_request(
+    resource_group_name: str, account_name: str, 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-01-01"))
+    file_services_name: Literal["default"] = kwargs.pop("file_services_name", "default")
+    file_service_usages_name: Literal["default"] = kwargs.pop("file_service_usages_name", "default")
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/fileServices/{FileServicesName}/usages/{fileServiceUsagesName}",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+        "FileServicesName": _SERIALIZER.url("file_services_name", file_services_name, "str"),
+        "fileServiceUsagesName": _SERIALIZER.url("file_service_usages_name", file_service_usages_name, "str"),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+class FileServicesOperations:
+    """
+    .. warning::
+        **DO NOT** instantiate this class directly.
+
+        Instead, you should access the following operations through
+        :class:`~azure.mgmt.storage.v2024_01_01.StorageManagementClient`'s
+        :attr:`file_services` attribute.
+    """
+
+    models = _models
+
+    def __init__(self, *args, **kwargs):
+        input_args = list(args)
+        self._client = input_args.pop(0) if input_args else kwargs.pop("client")
+        self._config = input_args.pop(0) if input_args else kwargs.pop("config")
+        self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer")
+        self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer")
+        self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version")
+
+    @distributed_trace
+    def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _models.FileServiceItems:
+        """List all file services in storage accounts.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :return: FileServiceItems or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.FileServiceItems
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.FileServiceItems] = kwargs.pop("cls", None)
+
+        _request = build_list_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("FileServiceItems", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @overload
+    def set_service_properties(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        parameters: _models.FileServiceProperties,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.FileServiceProperties:
+        """Sets the properties of file services in storage accounts, including CORS (Cross-Origin Resource
+        Sharing) rules.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param parameters: The properties of file services in storage accounts, including CORS
+         (Cross-Origin Resource Sharing) rules. Required.
+        :type parameters: ~azure.mgmt.storage.v2024_01_01.models.FileServiceProperties
+        :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: FileServiceProperties or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.FileServiceProperties
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @overload
+    def set_service_properties(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        parameters: IO[bytes],
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.FileServiceProperties:
+        """Sets the properties of file services in storage accounts, including CORS (Cross-Origin Resource
+        Sharing) rules.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param parameters: The properties of file services in storage accounts, including CORS
+         (Cross-Origin Resource Sharing) rules. Required.
+        :type parameters: IO[bytes]
+        :keyword content_type: Body Parameter content-type. Content type parameter for binary body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: FileServiceProperties or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.FileServiceProperties
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @distributed_trace
+    def set_service_properties(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        parameters: Union[_models.FileServiceProperties, IO[bytes]],
+        **kwargs: Any
+    ) -> _models.FileServiceProperties:
+        """Sets the properties of file services in storage accounts, including CORS (Cross-Origin Resource
+        Sharing) rules.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param parameters: The properties of file services in storage accounts, including CORS
+         (Cross-Origin Resource Sharing) rules. Is either a FileServiceProperties type or a IO[bytes]
+         type. Required.
+        :type parameters: ~azure.mgmt.storage.v2024_01_01.models.FileServiceProperties or IO[bytes]
+        :return: FileServiceProperties or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.FileServiceProperties
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _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", self._api_version or "2024-01-01"))
+        file_services_name: Literal["default"] = kwargs.pop("file_services_name", "default")
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+        cls: ClsType[_models.FileServiceProperties] = kwargs.pop("cls", None)
+
+        content_type = content_type or "application/json"
+        _json = None
+        _content = None
+        if isinstance(parameters, (IOBase, bytes)):
+            _content = parameters
+        else:
+            _json = self._serialize.body(parameters, "FileServiceProperties")
+
+        _request = build_set_service_properties_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            file_services_name=file_services_name,
+            content_type=content_type,
+            json=_json,
+            content=_content,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("FileServiceProperties", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @distributed_trace
+    def get_service_properties(
+        self, resource_group_name: str, account_name: str, **kwargs: Any
+    ) -> _models.FileServiceProperties:
+        """Gets the properties of file services in storage accounts, including CORS (Cross-Origin Resource
+        Sharing) rules.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :return: FileServiceProperties or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.FileServiceProperties
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        file_services_name: Literal["default"] = kwargs.pop("file_services_name", "default")
+        cls: ClsType[_models.FileServiceProperties] = kwargs.pop("cls", None)
+
+        _request = build_get_service_properties_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            file_services_name=file_services_name,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("FileServiceProperties", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @distributed_trace
+    def list_service_usages(
+        self, resource_group_name: str, account_name: str, maxpagesize: Optional[int] = None, **kwargs: Any
+    ) -> Iterable["_models.FileServiceUsage"]:
+        """Gets the usages of file service in storage account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param maxpagesize: Optional, specifies the maximum number of file service usages to be
+         included in the list response. Default value is None.
+        :type maxpagesize: int
+        :return: An iterator like instance of either FileServiceUsage or the result of cls(response)
+        :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.storage.v2024_01_01.models.FileServiceUsage]
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        file_services_name: Literal["default"] = kwargs.pop("file_services_name", "default")
+        cls: ClsType[_models.FileServiceUsages] = kwargs.pop("cls", None)
+
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        def prepare_request(next_link=None):
+            if not next_link:
+
+                _request = build_list_service_usages_request(
+                    resource_group_name=resource_group_name,
+                    account_name=account_name,
+                    subscription_id=self._config.subscription_id,
+                    maxpagesize=maxpagesize,
+                    api_version=api_version,
+                    file_services_name=file_services_name,
+                    headers=_headers,
+                    params=_params,
+                )
+                _request.url = self._client.format_url(_request.url)
+
+            else:
+                # make call to next link with the client's api-version
+                _parsed_next_link = urllib.parse.urlparse(next_link)
+                _next_request_params = case_insensitive_dict(
+                    {
+                        key: [urllib.parse.quote(v) for v in value]
+                        for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items()
+                    }
+                )
+                _next_request_params["api-version"] = self._api_version
+                _request = HttpRequest(
+                    "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
+                )
+                _request.url = self._client.format_url(_request.url)
+                _request.method = "GET"
+            return _request
+
+        def extract_data(pipeline_response):
+            deserialized = self._deserialize("FileServiceUsages", pipeline_response)
+            list_of_elem = deserialized.value
+            if cls:
+                list_of_elem = cls(list_of_elem)  # type: ignore
+            return deserialized.next_link or None, iter(list_of_elem)
+
+        def get_next(next_link=None):
+            _request = prepare_request(next_link)
+
+            _stream = False
+            pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+                _request, stream=_stream, **kwargs
+            )
+            response = pipeline_response.http_response
+
+            if response.status_code not in [200]:
+                map_error(status_code=response.status_code, response=response, error_map=error_map)
+                raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+            return pipeline_response
+
+        return ItemPaged(get_next, extract_data)
+
+    @distributed_trace
+    def get_service_usage(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _models.FileServiceUsage:
+        """Gets the usage of file service in storage account including account limits, file share limits
+        and constants used in recommendations and bursting formula.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :return: FileServiceUsage or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.FileServiceUsage
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        file_services_name: Literal["default"] = kwargs.pop("file_services_name", "default")
+        file_service_usages_name: Literal["default"] = kwargs.pop("file_service_usages_name", "default")
+        cls: ClsType[_models.FileServiceUsage] = kwargs.pop("cls", None)
+
+        _request = build_get_service_usage_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            file_services_name=file_services_name,
+            file_service_usages_name=file_service_usages_name,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("FileServiceUsage", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/operations/_file_shares_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/operations/_file_shares_operations.py
new file mode 100644
index 000000000000..e06efff4c626
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/operations/_file_shares_operations.py
@@ -0,0 +1,1296 @@
+# 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.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+from io import IOBase
+import sys
+from typing import Any, Callable, Dict, IO, Iterable, Optional, TypeVar, Union, overload
+import urllib.parse
+
+from azure.core.exceptions import (
+    ClientAuthenticationError,
+    HttpResponseError,
+    ResourceExistsError,
+    ResourceNotFoundError,
+    ResourceNotModifiedError,
+    map_error,
+)
+from azure.core.paging import ItemPaged
+from azure.core.pipeline import PipelineResponse
+from azure.core.rest import HttpRequest, HttpResponse
+from azure.core.tracing.decorator import distributed_trace
+from azure.core.utils import case_insensitive_dict
+from azure.mgmt.core.exceptions import ARMErrorFormat
+
+from .. import models as _models
+from ..._serialization import Serializer
+
+if sys.version_info >= (3, 9):
+    from collections.abc import MutableMapping
+else:
+    from typing import MutableMapping  # type: ignore
+T = TypeVar("T")
+ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
+
+_SERIALIZER = Serializer()
+_SERIALIZER.client_side_validation = False
+
+
+def build_list_request(
+    resource_group_name: str,
+    account_name: str,
+    subscription_id: str,
+    *,
+    maxpagesize: Optional[str] = None,
+    filter: Optional[str] = None,
+    expand: Optional[str] = None,
+    **kwargs: Any
+) -> HttpRequest:
+    _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
+    _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-01-01"))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/fileServices/default/shares",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+    if maxpagesize is not None:
+        _params["$maxpagesize"] = _SERIALIZER.query("maxpagesize", maxpagesize, "str")
+    if filter is not None:
+        _params["$filter"] = _SERIALIZER.query("filter", filter, "str")
+    if expand is not None:
+        _params["$expand"] = _SERIALIZER.query("expand", expand, "str")
+
+    # Construct headers
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+def build_create_request(
+    resource_group_name: str,
+    account_name: str,
+    share_name: str,
+    subscription_id: str,
+    *,
+    expand: Optional[str] = None,
+    **kwargs: Any
+) -> HttpRequest:
+    _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
+    _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-01-01"))
+    content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/fileServices/default/shares/{shareName}",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "shareName": _SERIALIZER.url("share_name", share_name, "str", max_length=63, min_length=3),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    if expand is not None:
+        _params["$expand"] = _SERIALIZER.query("expand", expand, "str")
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    if content_type is not None:
+        _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str")
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="PUT", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+def build_update_request(
+    resource_group_name: str, account_name: str, share_name: str, 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-01-01"))
+    content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/fileServices/default/shares/{shareName}",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "shareName": _SERIALIZER.url("share_name", share_name, "str", max_length=63, min_length=3),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    if content_type is not None:
+        _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str")
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="PATCH", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+def build_get_request(
+    resource_group_name: str,
+    account_name: str,
+    share_name: str,
+    subscription_id: str,
+    *,
+    expand: Optional[str] = None,
+    x_ms_snapshot: Optional[str] = None,
+    **kwargs: Any
+) -> HttpRequest:
+    _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
+    _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-01-01"))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/fileServices/default/shares/{shareName}",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "shareName": _SERIALIZER.url("share_name", share_name, "str", max_length=63, min_length=3),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+    if expand is not None:
+        _params["$expand"] = _SERIALIZER.query("expand", expand, "str")
+
+    # Construct headers
+    if x_ms_snapshot is not None:
+        _headers["x-ms-snapshot"] = _SERIALIZER.header("x_ms_snapshot", x_ms_snapshot, "str")
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+def build_delete_request(
+    resource_group_name: str,
+    account_name: str,
+    share_name: str,
+    subscription_id: str,
+    *,
+    x_ms_snapshot: Optional[str] = None,
+    include: Optional[str] = None,
+    **kwargs: Any
+) -> HttpRequest:
+    _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
+    _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-01-01"))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/fileServices/default/shares/{shareName}",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "shareName": _SERIALIZER.url("share_name", share_name, "str", max_length=63, min_length=3),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+    if include is not None:
+        _params["$include"] = _SERIALIZER.query("include", include, "str")
+
+    # Construct headers
+    if x_ms_snapshot is not None:
+        _headers["x-ms-snapshot"] = _SERIALIZER.header("x_ms_snapshot", x_ms_snapshot, "str")
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="DELETE", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+def build_restore_request(
+    resource_group_name: str, account_name: str, share_name: str, 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-01-01"))
+    content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/fileServices/default/shares/{shareName}/restore",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "shareName": _SERIALIZER.url("share_name", share_name, "str", max_length=63, min_length=3),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    if content_type is not None:
+        _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str")
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="POST", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+def build_lease_request(
+    resource_group_name: str,
+    account_name: str,
+    share_name: str,
+    subscription_id: str,
+    *,
+    x_ms_snapshot: Optional[str] = None,
+    **kwargs: Any
+) -> HttpRequest:
+    _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
+    _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-01-01"))
+    content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/fileServices/default/shares/{shareName}/lease",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "shareName": _SERIALIZER.url("share_name", share_name, "str", max_length=63, min_length=3),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    if x_ms_snapshot is not None:
+        _headers["x-ms-snapshot"] = _SERIALIZER.header("x_ms_snapshot", x_ms_snapshot, "str")
+    if content_type is not None:
+        _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str")
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="POST", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+class FileSharesOperations:
+    """
+    .. warning::
+        **DO NOT** instantiate this class directly.
+
+        Instead, you should access the following operations through
+        :class:`~azure.mgmt.storage.v2024_01_01.StorageManagementClient`'s
+        :attr:`file_shares` attribute.
+    """
+
+    models = _models
+
+    def __init__(self, *args, **kwargs):
+        input_args = list(args)
+        self._client = input_args.pop(0) if input_args else kwargs.pop("client")
+        self._config = input_args.pop(0) if input_args else kwargs.pop("config")
+        self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer")
+        self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer")
+        self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version")
+
+    @distributed_trace
+    def list(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        maxpagesize: Optional[str] = None,
+        filter: Optional[str] = None,
+        expand: Optional[str] = None,
+        **kwargs: Any
+    ) -> Iterable["_models.FileShareItem"]:
+        """Lists all shares.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param maxpagesize: Optional. Specified maximum number of shares that can be included in the
+         list. Default value is None.
+        :type maxpagesize: str
+        :param filter: Optional. When specified, only share names starting with the filter will be
+         listed. Default value is None.
+        :type filter: str
+        :param expand: Optional, used to expand the properties within share's properties. Valid values
+         are: deleted, snapshots. Should be passed as a string with delimiter ','. Default value is
+         None.
+        :type expand: str
+        :return: An iterator like instance of either FileShareItem or the result of cls(response)
+        :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.storage.v2024_01_01.models.FileShareItem]
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.FileShareItems] = kwargs.pop("cls", None)
+
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        def prepare_request(next_link=None):
+            if not next_link:
+
+                _request = build_list_request(
+                    resource_group_name=resource_group_name,
+                    account_name=account_name,
+                    subscription_id=self._config.subscription_id,
+                    maxpagesize=maxpagesize,
+                    filter=filter,
+                    expand=expand,
+                    api_version=api_version,
+                    headers=_headers,
+                    params=_params,
+                )
+                _request.url = self._client.format_url(_request.url)
+
+            else:
+                # make call to next link with the client's api-version
+                _parsed_next_link = urllib.parse.urlparse(next_link)
+                _next_request_params = case_insensitive_dict(
+                    {
+                        key: [urllib.parse.quote(v) for v in value]
+                        for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items()
+                    }
+                )
+                _next_request_params["api-version"] = self._api_version
+                _request = HttpRequest(
+                    "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
+                )
+                _request.url = self._client.format_url(_request.url)
+                _request.method = "GET"
+            return _request
+
+        def extract_data(pipeline_response):
+            deserialized = self._deserialize("FileShareItems", pipeline_response)
+            list_of_elem = deserialized.value
+            if cls:
+                list_of_elem = cls(list_of_elem)  # type: ignore
+            return deserialized.next_link or None, iter(list_of_elem)
+
+        def get_next(next_link=None):
+            _request = prepare_request(next_link)
+
+            _stream = False
+            pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+                _request, stream=_stream, **kwargs
+            )
+            response = pipeline_response.http_response
+
+            if response.status_code not in [200]:
+                map_error(status_code=response.status_code, response=response, error_map=error_map)
+                raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+            return pipeline_response
+
+        return ItemPaged(get_next, extract_data)
+
+    @overload
+    def create(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        share_name: str,
+        file_share: _models.FileShare,
+        expand: Optional[str] = None,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.FileShare:
+        """Creates a new share under the specified account as described by request body. The share
+        resource includes metadata and properties for that share. It does not include a list of the
+        files contained by the share.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param share_name: The name of the file share within the specified storage account. File share
+         names must be between 3 and 63 characters in length and use numbers, lower-case letters and
+         dash (-) only. Every dash (-) character must be immediately preceded and followed by a letter
+         or number. Required.
+        :type share_name: str
+        :param file_share: Properties of the file share to create. Required.
+        :type file_share: ~azure.mgmt.storage.v2024_01_01.models.FileShare
+        :param expand: Optional, used to expand the properties within share's properties. Valid values
+         are: snapshots. Should be passed as a string with delimiter ','. Default value is None.
+        :type expand: str
+        :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: FileShare or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.FileShare
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @overload
+    def create(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        share_name: str,
+        file_share: IO[bytes],
+        expand: Optional[str] = None,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.FileShare:
+        """Creates a new share under the specified account as described by request body. The share
+        resource includes metadata and properties for that share. It does not include a list of the
+        files contained by the share.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param share_name: The name of the file share within the specified storage account. File share
+         names must be between 3 and 63 characters in length and use numbers, lower-case letters and
+         dash (-) only. Every dash (-) character must be immediately preceded and followed by a letter
+         or number. Required.
+        :type share_name: str
+        :param file_share: Properties of the file share to create. Required.
+        :type file_share: IO[bytes]
+        :param expand: Optional, used to expand the properties within share's properties. Valid values
+         are: snapshots. Should be passed as a string with delimiter ','. Default value is None.
+        :type expand: str
+        :keyword content_type: Body Parameter content-type. Content type parameter for binary body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: FileShare or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.FileShare
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @distributed_trace
+    def create(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        share_name: str,
+        file_share: Union[_models.FileShare, IO[bytes]],
+        expand: Optional[str] = None,
+        **kwargs: Any
+    ) -> _models.FileShare:
+        """Creates a new share under the specified account as described by request body. The share
+        resource includes metadata and properties for that share. It does not include a list of the
+        files contained by the share.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param share_name: The name of the file share within the specified storage account. File share
+         names must be between 3 and 63 characters in length and use numbers, lower-case letters and
+         dash (-) only. Every dash (-) character must be immediately preceded and followed by a letter
+         or number. Required.
+        :type share_name: str
+        :param file_share: Properties of the file share to create. Is either a FileShare type or a
+         IO[bytes] type. Required.
+        :type file_share: ~azure.mgmt.storage.v2024_01_01.models.FileShare or IO[bytes]
+        :param expand: Optional, used to expand the properties within share's properties. Valid values
+         are: snapshots. Should be passed as a string with delimiter ','. Default value is None.
+        :type expand: str
+        :return: FileShare or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.FileShare
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _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", self._api_version or "2024-01-01"))
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+        cls: ClsType[_models.FileShare] = kwargs.pop("cls", None)
+
+        content_type = content_type or "application/json"
+        _json = None
+        _content = None
+        if isinstance(file_share, (IOBase, bytes)):
+            _content = file_share
+        else:
+            _json = self._serialize.body(file_share, "FileShare")
+
+        _request = build_create_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            share_name=share_name,
+            subscription_id=self._config.subscription_id,
+            expand=expand,
+            api_version=api_version,
+            content_type=content_type,
+            json=_json,
+            content=_content,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200, 201]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("FileShare", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @overload
+    def update(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        share_name: str,
+        file_share: _models.FileShare,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.FileShare:
+        """Updates share properties as specified in request body. Properties not mentioned in the request
+        will not be changed. Update fails if the specified share does not already exist.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param share_name: The name of the file share within the specified storage account. File share
+         names must be between 3 and 63 characters in length and use numbers, lower-case letters and
+         dash (-) only. Every dash (-) character must be immediately preceded and followed by a letter
+         or number. Required.
+        :type share_name: str
+        :param file_share: Properties to update for the file share. Required.
+        :type file_share: ~azure.mgmt.storage.v2024_01_01.models.FileShare
+        :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: FileShare or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.FileShare
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @overload
+    def update(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        share_name: str,
+        file_share: IO[bytes],
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.FileShare:
+        """Updates share properties as specified in request body. Properties not mentioned in the request
+        will not be changed. Update fails if the specified share does not already exist.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param share_name: The name of the file share within the specified storage account. File share
+         names must be between 3 and 63 characters in length and use numbers, lower-case letters and
+         dash (-) only. Every dash (-) character must be immediately preceded and followed by a letter
+         or number. Required.
+        :type share_name: str
+        :param file_share: Properties to update for the file share. Required.
+        :type file_share: IO[bytes]
+        :keyword content_type: Body Parameter content-type. Content type parameter for binary body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: FileShare or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.FileShare
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @distributed_trace
+    def update(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        share_name: str,
+        file_share: Union[_models.FileShare, IO[bytes]],
+        **kwargs: Any
+    ) -> _models.FileShare:
+        """Updates share properties as specified in request body. Properties not mentioned in the request
+        will not be changed. Update fails if the specified share does not already exist.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param share_name: The name of the file share within the specified storage account. File share
+         names must be between 3 and 63 characters in length and use numbers, lower-case letters and
+         dash (-) only. Every dash (-) character must be immediately preceded and followed by a letter
+         or number. Required.
+        :type share_name: str
+        :param file_share: Properties to update for the file share. Is either a FileShare type or a
+         IO[bytes] type. Required.
+        :type file_share: ~azure.mgmt.storage.v2024_01_01.models.FileShare or IO[bytes]
+        :return: FileShare or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.FileShare
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _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", self._api_version or "2024-01-01"))
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+        cls: ClsType[_models.FileShare] = kwargs.pop("cls", None)
+
+        content_type = content_type or "application/json"
+        _json = None
+        _content = None
+        if isinstance(file_share, (IOBase, bytes)):
+            _content = file_share
+        else:
+            _json = self._serialize.body(file_share, "FileShare")
+
+        _request = build_update_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            share_name=share_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            content_type=content_type,
+            json=_json,
+            content=_content,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("FileShare", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @distributed_trace
+    def get(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        share_name: str,
+        expand: Optional[str] = None,
+        x_ms_snapshot: Optional[str] = None,
+        **kwargs: Any
+    ) -> _models.FileShare:
+        """Gets properties of a specified share.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param share_name: The name of the file share within the specified storage account. File share
+         names must be between 3 and 63 characters in length and use numbers, lower-case letters and
+         dash (-) only. Every dash (-) character must be immediately preceded and followed by a letter
+         or number. Required.
+        :type share_name: str
+        :param expand: Optional, used to expand the properties within share's properties. Valid values
+         are: stats. Should be passed as a string with delimiter ','. Default value is None.
+        :type expand: str
+        :param x_ms_snapshot: Optional, used to retrieve properties of a snapshot. Default value is
+         None.
+        :type x_ms_snapshot: str
+        :return: FileShare or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.FileShare
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.FileShare] = kwargs.pop("cls", None)
+
+        _request = build_get_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            share_name=share_name,
+            subscription_id=self._config.subscription_id,
+            expand=expand,
+            x_ms_snapshot=x_ms_snapshot,
+            api_version=api_version,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("FileShare", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @distributed_trace
+    def delete(  # pylint: disable=inconsistent-return-statements
+        self,
+        resource_group_name: str,
+        account_name: str,
+        share_name: str,
+        x_ms_snapshot: Optional[str] = None,
+        include: Optional[str] = None,
+        **kwargs: Any
+    ) -> None:
+        """Deletes specified share under its account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param share_name: The name of the file share within the specified storage account. File share
+         names must be between 3 and 63 characters in length and use numbers, lower-case letters and
+         dash (-) only. Every dash (-) character must be immediately preceded and followed by a letter
+         or number. Required.
+        :type share_name: str
+        :param x_ms_snapshot: Optional, used to delete a snapshot. Default value is None.
+        :type x_ms_snapshot: str
+        :param include: Optional. Valid values are: snapshots, leased-snapshots, none. The default
+         value is snapshots. For 'snapshots', the file share is deleted including all of its file share
+         snapshots. If the file share contains leased-snapshots, the deletion fails. For
+         'leased-snapshots', the file share is deleted included all of its file share snapshots
+         (leased/unleased). For 'none', the file share is deleted if it has no share snapshots. If the
+         file share contains any snapshots (leased or unleased), the deletion fails. Default value is
+         None.
+        :type include: str
+        :return: None or the result of cls(response)
+        :rtype: None
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[None] = kwargs.pop("cls", None)
+
+        _request = build_delete_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            share_name=share_name,
+            subscription_id=self._config.subscription_id,
+            x_ms_snapshot=x_ms_snapshot,
+            include=include,
+            api_version=api_version,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200, 204]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        if cls:
+            return cls(pipeline_response, None, {})  # type: ignore
+
+    @overload
+    def restore(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        share_name: str,
+        deleted_share: _models.DeletedShare,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> None:
+        """Restore a file share within a valid retention days if share soft delete is enabled.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param share_name: The name of the file share within the specified storage account. File share
+         names must be between 3 and 63 characters in length and use numbers, lower-case letters and
+         dash (-) only. Every dash (-) character must be immediately preceded and followed by a letter
+         or number. Required.
+        :type share_name: str
+        :param deleted_share: Required.
+        :type deleted_share: ~azure.mgmt.storage.v2024_01_01.models.DeletedShare
+        :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: None or the result of cls(response)
+        :rtype: None
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @overload
+    def restore(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        share_name: str,
+        deleted_share: IO[bytes],
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> None:
+        """Restore a file share within a valid retention days if share soft delete is enabled.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param share_name: The name of the file share within the specified storage account. File share
+         names must be between 3 and 63 characters in length and use numbers, lower-case letters and
+         dash (-) only. Every dash (-) character must be immediately preceded and followed by a letter
+         or number. Required.
+        :type share_name: str
+        :param deleted_share: Required.
+        :type deleted_share: IO[bytes]
+        :keyword content_type: Body Parameter content-type. Content type parameter for binary body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: None or the result of cls(response)
+        :rtype: None
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @distributed_trace
+    def restore(  # pylint: disable=inconsistent-return-statements
+        self,
+        resource_group_name: str,
+        account_name: str,
+        share_name: str,
+        deleted_share: Union[_models.DeletedShare, IO[bytes]],
+        **kwargs: Any
+    ) -> None:
+        """Restore a file share within a valid retention days if share soft delete is enabled.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param share_name: The name of the file share within the specified storage account. File share
+         names must be between 3 and 63 characters in length and use numbers, lower-case letters and
+         dash (-) only. Every dash (-) character must be immediately preceded and followed by a letter
+         or number. Required.
+        :type share_name: str
+        :param deleted_share: Is either a DeletedShare type or a IO[bytes] type. Required.
+        :type deleted_share: ~azure.mgmt.storage.v2024_01_01.models.DeletedShare or IO[bytes]
+        :return: None or the result of cls(response)
+        :rtype: None
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _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", self._api_version or "2024-01-01"))
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+        cls: ClsType[None] = kwargs.pop("cls", None)
+
+        content_type = content_type or "application/json"
+        _json = None
+        _content = None
+        if isinstance(deleted_share, (IOBase, bytes)):
+            _content = deleted_share
+        else:
+            _json = self._serialize.body(deleted_share, "DeletedShare")
+
+        _request = build_restore_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            share_name=share_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            content_type=content_type,
+            json=_json,
+            content=_content,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        if cls:
+            return cls(pipeline_response, None, {})  # type: ignore
+
+    @overload
+    def lease(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        share_name: str,
+        x_ms_snapshot: Optional[str] = None,
+        parameters: Optional[_models.LeaseShareRequest] = None,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.LeaseShareResponse:
+        """The Lease Share operation establishes and manages a lock on a share for delete operations. The
+        lock duration can be 15 to 60 seconds, or can be infinite.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param share_name: The name of the file share within the specified storage account. File share
+         names must be between 3 and 63 characters in length and use numbers, lower-case letters and
+         dash (-) only. Every dash (-) character must be immediately preceded and followed by a letter
+         or number. Required.
+        :type share_name: str
+        :param x_ms_snapshot: Optional. Specify the snapshot time to lease a snapshot. Default value is
+         None.
+        :type x_ms_snapshot: str
+        :param parameters: Lease Share request body. Default value is None.
+        :type parameters: ~azure.mgmt.storage.v2024_01_01.models.LeaseShareRequest
+        :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: LeaseShareResponse or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.LeaseShareResponse
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @overload
+    def lease(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        share_name: str,
+        x_ms_snapshot: Optional[str] = None,
+        parameters: Optional[IO[bytes]] = None,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.LeaseShareResponse:
+        """The Lease Share operation establishes and manages a lock on a share for delete operations. The
+        lock duration can be 15 to 60 seconds, or can be infinite.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param share_name: The name of the file share within the specified storage account. File share
+         names must be between 3 and 63 characters in length and use numbers, lower-case letters and
+         dash (-) only. Every dash (-) character must be immediately preceded and followed by a letter
+         or number. Required.
+        :type share_name: str
+        :param x_ms_snapshot: Optional. Specify the snapshot time to lease a snapshot. Default value is
+         None.
+        :type x_ms_snapshot: str
+        :param parameters: Lease Share request body. Default value is None.
+        :type parameters: IO[bytes]
+        :keyword content_type: Body Parameter content-type. Content type parameter for binary body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: LeaseShareResponse or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.LeaseShareResponse
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @distributed_trace
+    def lease(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        share_name: str,
+        x_ms_snapshot: Optional[str] = None,
+        parameters: Optional[Union[_models.LeaseShareRequest, IO[bytes]]] = None,
+        **kwargs: Any
+    ) -> _models.LeaseShareResponse:
+        """The Lease Share operation establishes and manages a lock on a share for delete operations. The
+        lock duration can be 15 to 60 seconds, or can be infinite.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param share_name: The name of the file share within the specified storage account. File share
+         names must be between 3 and 63 characters in length and use numbers, lower-case letters and
+         dash (-) only. Every dash (-) character must be immediately preceded and followed by a letter
+         or number. Required.
+        :type share_name: str
+        :param x_ms_snapshot: Optional. Specify the snapshot time to lease a snapshot. Default value is
+         None.
+        :type x_ms_snapshot: str
+        :param parameters: Lease Share request body. Is either a LeaseShareRequest type or a IO[bytes]
+         type. Default value is None.
+        :type parameters: ~azure.mgmt.storage.v2024_01_01.models.LeaseShareRequest or IO[bytes]
+        :return: LeaseShareResponse or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.LeaseShareResponse
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _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", self._api_version or "2024-01-01"))
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+        cls: ClsType[_models.LeaseShareResponse] = kwargs.pop("cls", None)
+
+        content_type = content_type or "application/json"
+        _json = None
+        _content = None
+        if isinstance(parameters, (IOBase, bytes)):
+            _content = parameters
+        else:
+            if parameters is not None:
+                _json = self._serialize.body(parameters, "LeaseShareRequest")
+            else:
+                _json = None
+
+        _request = build_lease_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            share_name=share_name,
+            subscription_id=self._config.subscription_id,
+            x_ms_snapshot=x_ms_snapshot,
+            api_version=api_version,
+            content_type=content_type,
+            json=_json,
+            content=_content,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        response_headers = {}
+        response_headers["ETag"] = self._deserialize("str", response.headers.get("ETag"))
+
+        deserialized = self._deserialize("LeaseShareResponse", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, response_headers)  # type: ignore
+
+        return deserialized  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/operations/_local_users_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/operations/_local_users_operations.py
new file mode 100644
index 000000000000..88a9928a5df3
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/operations/_local_users_operations.py
@@ -0,0 +1,798 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+from io import IOBase
+import sys
+from typing import Any, Callable, Dict, IO, Iterable, Optional, TypeVar, Union, overload
+import urllib.parse
+
+from azure.core.exceptions import (
+    ClientAuthenticationError,
+    HttpResponseError,
+    ResourceExistsError,
+    ResourceNotFoundError,
+    ResourceNotModifiedError,
+    map_error,
+)
+from azure.core.paging import ItemPaged
+from azure.core.pipeline import PipelineResponse
+from azure.core.rest import HttpRequest, HttpResponse
+from azure.core.tracing.decorator import distributed_trace
+from azure.core.utils import case_insensitive_dict
+from azure.mgmt.core.exceptions import ARMErrorFormat
+
+from .. import models as _models
+from ..._serialization import Serializer
+
+if sys.version_info >= (3, 9):
+    from collections.abc import MutableMapping
+else:
+    from typing import MutableMapping  # type: ignore
+T = TypeVar("T")
+ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
+
+_SERIALIZER = Serializer()
+_SERIALIZER.client_side_validation = False
+
+
+def build_list_request(
+    resource_group_name: str,
+    account_name: str,
+    subscription_id: str,
+    *,
+    maxpagesize: Optional[int] = None,
+    filter: Optional[str] = None,
+    include: Optional[Union[str, _models.ListLocalUserIncludeParam]] = None,
+    **kwargs: Any
+) -> HttpRequest:
+    _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
+    _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-01-01"))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/localUsers",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+    if maxpagesize is not None:
+        _params["$maxpagesize"] = _SERIALIZER.query("maxpagesize", maxpagesize, "int", maximum=5000, minimum=1)
+    if filter is not None:
+        _params["$filter"] = _SERIALIZER.query("filter", filter, "str")
+    if include is not None:
+        _params["$include"] = _SERIALIZER.query("include", include, "str")
+
+    # Construct headers
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+def build_get_request(
+    resource_group_name: str, account_name: str, username: str, 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-01-01"))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/localUsers/{username}",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+        "username": _SERIALIZER.url("username", username, "str", max_length=64, min_length=3),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+def build_create_or_update_request(
+    resource_group_name: str, account_name: str, username: str, 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-01-01"))
+    content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/localUsers/{username}",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+        "username": _SERIALIZER.url("username", username, "str", max_length=64, min_length=3),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    if content_type is not None:
+        _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str")
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="PUT", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+def build_delete_request(
+    resource_group_name: str, account_name: str, username: str, 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-01-01"))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/localUsers/{username}",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+        "username": _SERIALIZER.url("username", username, "str", max_length=64, min_length=3),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="DELETE", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+def build_list_keys_request(
+    resource_group_name: str, account_name: str, username: str, 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-01-01"))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/localUsers/{username}/listKeys",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+        "username": _SERIALIZER.url("username", username, "str", max_length=64, min_length=3),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="POST", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+def build_regenerate_password_request(
+    resource_group_name: str, account_name: str, username: str, 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-01-01"))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/localUsers/{username}/regeneratePassword",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+        "username": _SERIALIZER.url("username", username, "str", max_length=64, min_length=3),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="POST", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+class LocalUsersOperations:
+    """
+    .. warning::
+        **DO NOT** instantiate this class directly.
+
+        Instead, you should access the following operations through
+        :class:`~azure.mgmt.storage.v2024_01_01.StorageManagementClient`'s
+        :attr:`local_users` attribute.
+    """
+
+    models = _models
+
+    def __init__(self, *args, **kwargs):
+        input_args = list(args)
+        self._client = input_args.pop(0) if input_args else kwargs.pop("client")
+        self._config = input_args.pop(0) if input_args else kwargs.pop("config")
+        self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer")
+        self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer")
+        self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version")
+
+    @distributed_trace
+    def list(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        maxpagesize: Optional[int] = None,
+        filter: Optional[str] = None,
+        include: Optional[Union[str, _models.ListLocalUserIncludeParam]] = None,
+        **kwargs: Any
+    ) -> Iterable["_models.LocalUser"]:
+        """List the local users associated with the storage account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param maxpagesize: Optional, specifies the maximum number of local users that will be included
+         in the list response. Default value is None.
+        :type maxpagesize: int
+        :param filter: Optional. When specified, only local user names starting with the filter will be
+         listed. Default value is None.
+        :type filter: str
+        :param include: Optional, when specified, will list local users enabled for the specific
+         protocol. Lists all users by default. "nfsv3" Default value is None.
+        :type include: str or ~azure.mgmt.storage.v2024_01_01.models.ListLocalUserIncludeParam
+        :return: An iterator like instance of either LocalUser or the result of cls(response)
+        :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.storage.v2024_01_01.models.LocalUser]
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.LocalUsers] = kwargs.pop("cls", None)
+
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        def prepare_request(next_link=None):
+            if not next_link:
+
+                _request = build_list_request(
+                    resource_group_name=resource_group_name,
+                    account_name=account_name,
+                    subscription_id=self._config.subscription_id,
+                    maxpagesize=maxpagesize,
+                    filter=filter,
+                    include=include,
+                    api_version=api_version,
+                    headers=_headers,
+                    params=_params,
+                )
+                _request.url = self._client.format_url(_request.url)
+
+            else:
+                # make call to next link with the client's api-version
+                _parsed_next_link = urllib.parse.urlparse(next_link)
+                _next_request_params = case_insensitive_dict(
+                    {
+                        key: [urllib.parse.quote(v) for v in value]
+                        for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items()
+                    }
+                )
+                _next_request_params["api-version"] = self._api_version
+                _request = HttpRequest(
+                    "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
+                )
+                _request.url = self._client.format_url(_request.url)
+                _request.method = "GET"
+            return _request
+
+        def extract_data(pipeline_response):
+            deserialized = self._deserialize("LocalUsers", pipeline_response)
+            list_of_elem = deserialized.value
+            if cls:
+                list_of_elem = cls(list_of_elem)  # type: ignore
+            return None, iter(list_of_elem)
+
+        def get_next(next_link=None):
+            _request = prepare_request(next_link)
+
+            _stream = False
+            pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+                _request, stream=_stream, **kwargs
+            )
+            response = pipeline_response.http_response
+
+            if response.status_code not in [200]:
+                map_error(status_code=response.status_code, response=response, error_map=error_map)
+                error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
+                raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
+
+            return pipeline_response
+
+        return ItemPaged(get_next, extract_data)
+
+    @distributed_trace
+    def get(self, resource_group_name: str, account_name: str, username: str, **kwargs: Any) -> _models.LocalUser:
+        """Get the local user of the storage account by username.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param username: The name of local user. The username must contain lowercase letters and
+         numbers only. It must be unique only within the storage account. Required.
+        :type username: str
+        :return: LocalUser or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.LocalUser
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.LocalUser] = kwargs.pop("cls", None)
+
+        _request = build_get_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            username=username,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
+            raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("LocalUser", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @overload
+    def create_or_update(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        username: str,
+        properties: _models.LocalUser,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.LocalUser:
+        """Create or update the properties of a local user associated with the storage account. Properties
+        for NFSv3 enablement and extended groups cannot be set with other properties.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param username: The name of local user. The username must contain lowercase letters and
+         numbers only. It must be unique only within the storage account. Required.
+        :type username: str
+        :param properties: The local user associated with a storage account. Required.
+        :type properties: ~azure.mgmt.storage.v2024_01_01.models.LocalUser
+        :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: LocalUser or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.LocalUser
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @overload
+    def create_or_update(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        username: str,
+        properties: IO[bytes],
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.LocalUser:
+        """Create or update the properties of a local user associated with the storage account. Properties
+        for NFSv3 enablement and extended groups cannot be set with other properties.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param username: The name of local user. The username must contain lowercase letters and
+         numbers only. It must be unique only within the storage account. Required.
+        :type username: str
+        :param properties: The local user associated with a storage account. Required.
+        :type properties: IO[bytes]
+        :keyword content_type: Body Parameter content-type. Content type parameter for binary body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: LocalUser or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.LocalUser
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @distributed_trace
+    def create_or_update(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        username: str,
+        properties: Union[_models.LocalUser, IO[bytes]],
+        **kwargs: Any
+    ) -> _models.LocalUser:
+        """Create or update the properties of a local user associated with the storage account. Properties
+        for NFSv3 enablement and extended groups cannot be set with other properties.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param username: The name of local user. The username must contain lowercase letters and
+         numbers only. It must be unique only within the storage account. Required.
+        :type username: str
+        :param properties: The local user associated with a storage account. Is either a LocalUser type
+         or a IO[bytes] type. Required.
+        :type properties: ~azure.mgmt.storage.v2024_01_01.models.LocalUser or IO[bytes]
+        :return: LocalUser or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.LocalUser
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _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", self._api_version or "2024-01-01"))
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+        cls: ClsType[_models.LocalUser] = kwargs.pop("cls", None)
+
+        content_type = content_type or "application/json"
+        _json = None
+        _content = None
+        if isinstance(properties, (IOBase, bytes)):
+            _content = properties
+        else:
+            _json = self._serialize.body(properties, "LocalUser")
+
+        _request = build_create_or_update_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            username=username,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            content_type=content_type,
+            json=_json,
+            content=_content,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
+            raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("LocalUser", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @distributed_trace
+    def delete(  # pylint: disable=inconsistent-return-statements
+        self, resource_group_name: str, account_name: str, username: str, **kwargs: Any
+    ) -> None:
+        """Deletes the local user associated with the specified storage account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param username: The name of local user. The username must contain lowercase letters and
+         numbers only. It must be unique only within the storage account. Required.
+        :type username: str
+        :return: None or the result of cls(response)
+        :rtype: None
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[None] = kwargs.pop("cls", None)
+
+        _request = build_delete_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            username=username,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200, 204]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
+            raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
+
+        if cls:
+            return cls(pipeline_response, None, {})  # type: ignore
+
+    @distributed_trace
+    def list_keys(
+        self, resource_group_name: str, account_name: str, username: str, **kwargs: Any
+    ) -> _models.LocalUserKeys:
+        """List SSH authorized keys and shared key of the local user.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param username: The name of local user. The username must contain lowercase letters and
+         numbers only. It must be unique only within the storage account. Required.
+        :type username: str
+        :return: LocalUserKeys or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.LocalUserKeys
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.LocalUserKeys] = kwargs.pop("cls", None)
+
+        _request = build_list_keys_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            username=username,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
+            raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("LocalUserKeys", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @distributed_trace
+    def regenerate_password(
+        self, resource_group_name: str, account_name: str, username: str, **kwargs: Any
+    ) -> _models.LocalUserRegeneratePasswordResult:
+        """Regenerate the local user SSH password.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param username: The name of local user. The username must contain lowercase letters and
+         numbers only. It must be unique only within the storage account. Required.
+        :type username: str
+        :return: LocalUserRegeneratePasswordResult or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.LocalUserRegeneratePasswordResult
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.LocalUserRegeneratePasswordResult] = kwargs.pop("cls", None)
+
+        _request = build_regenerate_password_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            username=username,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
+            raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("LocalUserRegeneratePasswordResult", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/operations/_management_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/operations/_management_policies_operations.py
new file mode 100644
index 000000000000..0e1f50568816
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/operations/_management_policies_operations.py
@@ -0,0 +1,459 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+from io import IOBase
+import sys
+from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload
+
+from azure.core.exceptions import (
+    ClientAuthenticationError,
+    HttpResponseError,
+    ResourceExistsError,
+    ResourceNotFoundError,
+    ResourceNotModifiedError,
+    map_error,
+)
+from azure.core.pipeline import PipelineResponse
+from azure.core.rest import HttpRequest, HttpResponse
+from azure.core.tracing.decorator import distributed_trace
+from azure.core.utils import case_insensitive_dict
+from azure.mgmt.core.exceptions import ARMErrorFormat
+
+from .. import models as _models
+from ..._serialization import Serializer
+
+if sys.version_info >= (3, 9):
+    from collections.abc import MutableMapping
+else:
+    from typing import MutableMapping  # type: ignore
+T = TypeVar("T")
+ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
+
+_SERIALIZER = Serializer()
+_SERIALIZER.client_side_validation = False
+
+
+def build_get_request(
+    resource_group_name: str,
+    account_name: str,
+    management_policy_name: Union[str, _models.ManagementPolicyName],
+    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-01-01"))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/managementPolicies/{managementPolicyName}",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+        "managementPolicyName": _SERIALIZER.url("management_policy_name", management_policy_name, "str"),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+def build_create_or_update_request(
+    resource_group_name: str,
+    account_name: str,
+    management_policy_name: Union[str, _models.ManagementPolicyName],
+    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-01-01"))
+    content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/managementPolicies/{managementPolicyName}",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+        "managementPolicyName": _SERIALIZER.url("management_policy_name", management_policy_name, "str"),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    if content_type is not None:
+        _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str")
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="PUT", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+def build_delete_request(
+    resource_group_name: str,
+    account_name: str,
+    management_policy_name: Union[str, _models.ManagementPolicyName],
+    subscription_id: str,
+    **kwargs: Any
+) -> HttpRequest:
+    _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-01-01"))
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/managementPolicies/{managementPolicyName}",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+        "managementPolicyName": _SERIALIZER.url("management_policy_name", management_policy_name, "str"),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    return HttpRequest(method="DELETE", url=_url, params=_params, **kwargs)
+
+
+class ManagementPoliciesOperations:
+    """
+    .. warning::
+        **DO NOT** instantiate this class directly.
+
+        Instead, you should access the following operations through
+        :class:`~azure.mgmt.storage.v2024_01_01.StorageManagementClient`'s
+        :attr:`management_policies` attribute.
+    """
+
+    models = _models
+
+    def __init__(self, *args, **kwargs):
+        input_args = list(args)
+        self._client = input_args.pop(0) if input_args else kwargs.pop("client")
+        self._config = input_args.pop(0) if input_args else kwargs.pop("config")
+        self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer")
+        self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer")
+        self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version")
+
+    @distributed_trace
+    def get(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        management_policy_name: Union[str, _models.ManagementPolicyName],
+        **kwargs: Any
+    ) -> _models.ManagementPolicy:
+        """Gets the managementpolicy associated with the specified storage account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param management_policy_name: The name of the Storage Account Management Policy. It should
+         always be 'default'. "default" Required.
+        :type management_policy_name: str or
+         ~azure.mgmt.storage.v2024_01_01.models.ManagementPolicyName
+        :return: ManagementPolicy or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.ManagementPolicy
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.ManagementPolicy] = kwargs.pop("cls", None)
+
+        _request = build_get_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            management_policy_name=management_policy_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("ManagementPolicy", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @overload
+    def create_or_update(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        management_policy_name: Union[str, _models.ManagementPolicyName],
+        properties: _models.ManagementPolicy,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.ManagementPolicy:
+        """Sets the managementpolicy to the specified storage account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param management_policy_name: The name of the Storage Account Management Policy. It should
+         always be 'default'. "default" Required.
+        :type management_policy_name: str or
+         ~azure.mgmt.storage.v2024_01_01.models.ManagementPolicyName
+        :param properties: The ManagementPolicy set to a storage account. Required.
+        :type properties: ~azure.mgmt.storage.v2024_01_01.models.ManagementPolicy
+        :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: ManagementPolicy or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.ManagementPolicy
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @overload
+    def create_or_update(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        management_policy_name: Union[str, _models.ManagementPolicyName],
+        properties: IO[bytes],
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.ManagementPolicy:
+        """Sets the managementpolicy to the specified storage account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param management_policy_name: The name of the Storage Account Management Policy. It should
+         always be 'default'. "default" Required.
+        :type management_policy_name: str or
+         ~azure.mgmt.storage.v2024_01_01.models.ManagementPolicyName
+        :param properties: The ManagementPolicy set to a storage account. Required.
+        :type properties: IO[bytes]
+        :keyword content_type: Body Parameter content-type. Content type parameter for binary body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: ManagementPolicy or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.ManagementPolicy
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @distributed_trace
+    def create_or_update(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        management_policy_name: Union[str, _models.ManagementPolicyName],
+        properties: Union[_models.ManagementPolicy, IO[bytes]],
+        **kwargs: Any
+    ) -> _models.ManagementPolicy:
+        """Sets the managementpolicy to the specified storage account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param management_policy_name: The name of the Storage Account Management Policy. It should
+         always be 'default'. "default" Required.
+        :type management_policy_name: str or
+         ~azure.mgmt.storage.v2024_01_01.models.ManagementPolicyName
+        :param properties: The ManagementPolicy set to a storage account. Is either a ManagementPolicy
+         type or a IO[bytes] type. Required.
+        :type properties: ~azure.mgmt.storage.v2024_01_01.models.ManagementPolicy or IO[bytes]
+        :return: ManagementPolicy or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.ManagementPolicy
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _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", self._api_version or "2024-01-01"))
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+        cls: ClsType[_models.ManagementPolicy] = kwargs.pop("cls", None)
+
+        content_type = content_type or "application/json"
+        _json = None
+        _content = None
+        if isinstance(properties, (IOBase, bytes)):
+            _content = properties
+        else:
+            _json = self._serialize.body(properties, "ManagementPolicy")
+
+        _request = build_create_or_update_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            management_policy_name=management_policy_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            content_type=content_type,
+            json=_json,
+            content=_content,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("ManagementPolicy", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @distributed_trace
+    def delete(  # pylint: disable=inconsistent-return-statements
+        self,
+        resource_group_name: str,
+        account_name: str,
+        management_policy_name: Union[str, _models.ManagementPolicyName],
+        **kwargs: Any
+    ) -> None:
+        """Deletes the managementpolicy associated with the specified storage account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param management_policy_name: The name of the Storage Account Management Policy. It should
+         always be 'default'. "default" Required.
+        :type management_policy_name: str or
+         ~azure.mgmt.storage.v2024_01_01.models.ManagementPolicyName
+        :return: None or the result of cls(response)
+        :rtype: None
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[None] = kwargs.pop("cls", None)
+
+        _request = build_delete_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            management_policy_name=management_policy_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200, 204]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        if cls:
+            return cls(pipeline_response, None, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/operations/_network_security_perimeter_configurations_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/operations/_network_security_perimeter_configurations_operations.py
new file mode 100644
index 000000000000..12e5cf920cc4
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/operations/_network_security_perimeter_configurations_operations.py
@@ -0,0 +1,468 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+import sys
+from typing import Any, Callable, Dict, Iterable, Iterator, Optional, TypeVar, Union, cast
+import urllib.parse
+
+from azure.core.exceptions import (
+    ClientAuthenticationError,
+    HttpResponseError,
+    ResourceExistsError,
+    ResourceNotFoundError,
+    ResourceNotModifiedError,
+    StreamClosedError,
+    StreamConsumedError,
+    map_error,
+)
+from azure.core.paging import ItemPaged
+from azure.core.pipeline import PipelineResponse
+from azure.core.polling import LROPoller, NoPolling, PollingMethod
+from azure.core.rest import HttpRequest, HttpResponse
+from azure.core.tracing.decorator import distributed_trace
+from azure.core.utils import case_insensitive_dict
+from azure.mgmt.core.exceptions import ARMErrorFormat
+from azure.mgmt.core.polling.arm_polling import ARMPolling
+
+from .. import models as _models
+from ..._serialization import Serializer
+
+if sys.version_info >= (3, 9):
+    from collections.abc import MutableMapping
+else:
+    from typing import MutableMapping  # type: ignore
+T = TypeVar("T")
+ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
+
+_SERIALIZER = Serializer()
+_SERIALIZER.client_side_validation = False
+
+
+def build_list_request(resource_group_name: str, account_name: str, 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-01-01"))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/networkSecurityPerimeterConfigurations",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+def build_get_request(
+    resource_group_name: str,
+    account_name: str,
+    network_security_perimeter_configuration_name: str,
+    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-01-01"))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/networkSecurityPerimeterConfigurations/{networkSecurityPerimeterConfigurationName}",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "networkSecurityPerimeterConfigurationName": _SERIALIZER.url(
+            "network_security_perimeter_configuration_name",
+            network_security_perimeter_configuration_name,
+            "str",
+            pattern=r"^.*$",
+        ),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+def build_reconcile_request(
+    resource_group_name: str,
+    account_name: str,
+    network_security_perimeter_configuration_name: str,
+    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-01-01"))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/networkSecurityPerimeterConfigurations/{networkSecurityPerimeterConfigurationName}/reconcile",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "networkSecurityPerimeterConfigurationName": _SERIALIZER.url(
+            "network_security_perimeter_configuration_name",
+            network_security_perimeter_configuration_name,
+            "str",
+            pattern=r"^.*$",
+        ),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="POST", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+class NetworkSecurityPerimeterConfigurationsOperations:  # pylint: disable=name-too-long
+    """
+    .. warning::
+        **DO NOT** instantiate this class directly.
+
+        Instead, you should access the following operations through
+        :class:`~azure.mgmt.storage.v2024_01_01.StorageManagementClient`'s
+        :attr:`network_security_perimeter_configurations` attribute.
+    """
+
+    models = _models
+
+    def __init__(self, *args, **kwargs):
+        input_args = list(args)
+        self._client = input_args.pop(0) if input_args else kwargs.pop("client")
+        self._config = input_args.pop(0) if input_args else kwargs.pop("config")
+        self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer")
+        self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer")
+        self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version")
+
+    @distributed_trace
+    def list(
+        self, resource_group_name: str, account_name: str, **kwargs: Any
+    ) -> Iterable["_models.NetworkSecurityPerimeterConfiguration"]:
+        """Gets list of effective NetworkSecurityPerimeterConfiguration for storage account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :return: An iterator like instance of either NetworkSecurityPerimeterConfiguration or the
+         result of cls(response)
+        :rtype:
+         ~azure.core.paging.ItemPaged[~azure.mgmt.storage.v2024_01_01.models.NetworkSecurityPerimeterConfiguration]
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.NetworkSecurityPerimeterConfigurationList] = kwargs.pop("cls", None)
+
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        def prepare_request(next_link=None):
+            if not next_link:
+
+                _request = build_list_request(
+                    resource_group_name=resource_group_name,
+                    account_name=account_name,
+                    subscription_id=self._config.subscription_id,
+                    api_version=api_version,
+                    headers=_headers,
+                    params=_params,
+                )
+                _request.url = self._client.format_url(_request.url)
+
+            else:
+                # make call to next link with the client's api-version
+                _parsed_next_link = urllib.parse.urlparse(next_link)
+                _next_request_params = case_insensitive_dict(
+                    {
+                        key: [urllib.parse.quote(v) for v in value]
+                        for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items()
+                    }
+                )
+                _next_request_params["api-version"] = self._api_version
+                _request = HttpRequest(
+                    "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
+                )
+                _request.url = self._client.format_url(_request.url)
+                _request.method = "GET"
+            return _request
+
+        def extract_data(pipeline_response):
+            deserialized = self._deserialize("NetworkSecurityPerimeterConfigurationList", pipeline_response)
+            list_of_elem = deserialized.value
+            if cls:
+                list_of_elem = cls(list_of_elem)  # type: ignore
+            return None, iter(list_of_elem)
+
+        def get_next(next_link=None):
+            _request = prepare_request(next_link)
+
+            _stream = False
+            pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+                _request, stream=_stream, **kwargs
+            )
+            response = pipeline_response.http_response
+
+            if response.status_code not in [200]:
+                map_error(status_code=response.status_code, response=response, error_map=error_map)
+                error = self._deserialize.failsafe_deserialize(_models.ErrorResponseAutoGenerated, pipeline_response)
+                raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
+
+            return pipeline_response
+
+        return ItemPaged(get_next, extract_data)
+
+    @distributed_trace
+    def get(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        network_security_perimeter_configuration_name: str,
+        **kwargs: Any
+    ) -> _models.NetworkSecurityPerimeterConfiguration:
+        """Gets effective NetworkSecurityPerimeterConfiguration for association.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param network_security_perimeter_configuration_name: The name for Network Security Perimeter
+         configuration. Required.
+        :type network_security_perimeter_configuration_name: str
+        :return: NetworkSecurityPerimeterConfiguration or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.NetworkSecurityPerimeterConfiguration
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.NetworkSecurityPerimeterConfiguration] = kwargs.pop("cls", None)
+
+        _request = build_get_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            network_security_perimeter_configuration_name=network_security_perimeter_configuration_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            error = self._deserialize.failsafe_deserialize(_models.ErrorResponseAutoGenerated, pipeline_response)
+            raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("NetworkSecurityPerimeterConfiguration", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    def _reconcile_initial(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        network_security_perimeter_configuration_name: str,
+        **kwargs: Any
+    ) -> Iterator[bytes]:
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
+
+        _request = build_reconcile_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            network_security_perimeter_configuration_name=network_security_perimeter_configuration_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
+        pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            error = self._deserialize.failsafe_deserialize(_models.ErrorResponseAutoGenerated, pipeline_response)
+            raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
+
+        response_headers = {}
+        response_headers["Location"] = self._deserialize("str", response.headers.get("Location"))
+
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
+        if cls:
+            return cls(pipeline_response, deserialized, response_headers)  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @distributed_trace
+    def begin_reconcile(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        network_security_perimeter_configuration_name: str,
+        **kwargs: Any
+    ) -> LROPoller[None]:
+        """Refreshes any information about the association.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param network_security_perimeter_configuration_name: The name for Network Security Perimeter
+         configuration. Required.
+        :type network_security_perimeter_configuration_name: str
+        :return: An instance of LROPoller that returns either None or the result of cls(response)
+        :rtype: ~azure.core.polling.LROPoller[None]
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[None] = kwargs.pop("cls", None)
+        polling: Union[bool, PollingMethod] = kwargs.pop("polling", True)
+        lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
+        cont_token: Optional[str] = kwargs.pop("continuation_token", None)
+        if cont_token is None:
+            raw_result = self._reconcile_initial(
+                resource_group_name=resource_group_name,
+                account_name=account_name,
+                network_security_perimeter_configuration_name=network_security_perimeter_configuration_name,
+                api_version=api_version,
+                cls=lambda x, y, z: x,
+                headers=_headers,
+                params=_params,
+                **kwargs
+            )
+            raw_result.http_response.read()  # type: ignore
+        kwargs.pop("error_map", None)
+
+        def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
+            if cls:
+                return cls(pipeline_response, None, {})  # type: ignore
+
+        if polling is True:
+            polling_method: PollingMethod = cast(
+                PollingMethod, ARMPolling(lro_delay, lro_options={"final-state-via": "location"}, **kwargs)
+            )
+        elif polling is False:
+            polling_method = cast(PollingMethod, NoPolling())
+        else:
+            polling_method = polling
+        if cont_token:
+            return LROPoller[None].from_continuation_token(
+                polling_method=polling_method,
+                continuation_token=cont_token,
+                client=self._client,
+                deserialization_callback=get_long_running_output,
+            )
+        return LROPoller[None](self._client, raw_result, get_long_running_output, polling_method)  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/operations/_object_replication_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/operations/_object_replication_policies_operations.py
new file mode 100644
index 000000000000..17f336c4d82e
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/operations/_object_replication_policies_operations.py
@@ -0,0 +1,585 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+from io import IOBase
+import sys
+from typing import Any, Callable, Dict, IO, Iterable, Optional, TypeVar, Union, overload
+import urllib.parse
+
+from azure.core.exceptions import (
+    ClientAuthenticationError,
+    HttpResponseError,
+    ResourceExistsError,
+    ResourceNotFoundError,
+    ResourceNotModifiedError,
+    map_error,
+)
+from azure.core.paging import ItemPaged
+from azure.core.pipeline import PipelineResponse
+from azure.core.rest import HttpRequest, HttpResponse
+from azure.core.tracing.decorator import distributed_trace
+from azure.core.utils import case_insensitive_dict
+from azure.mgmt.core.exceptions import ARMErrorFormat
+
+from .. import models as _models
+from ..._serialization import Serializer
+
+if sys.version_info >= (3, 9):
+    from collections.abc import MutableMapping
+else:
+    from typing import MutableMapping  # type: ignore
+T = TypeVar("T")
+ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
+
+_SERIALIZER = Serializer()
+_SERIALIZER.client_side_validation = False
+
+
+def build_list_request(resource_group_name: str, account_name: str, 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-01-01"))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/objectReplicationPolicies",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+def build_get_request(
+    resource_group_name: str, account_name: str, object_replication_policy_id: str, 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-01-01"))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/objectReplicationPolicies/{objectReplicationPolicyId}",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+        "objectReplicationPolicyId": _SERIALIZER.url(
+            "object_replication_policy_id", object_replication_policy_id, "str", min_length=1
+        ),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+def build_create_or_update_request(
+    resource_group_name: str, account_name: str, object_replication_policy_id: str, 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-01-01"))
+    content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/objectReplicationPolicies/{objectReplicationPolicyId}",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+        "objectReplicationPolicyId": _SERIALIZER.url(
+            "object_replication_policy_id", object_replication_policy_id, "str", min_length=1
+        ),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    if content_type is not None:
+        _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str")
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="PUT", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+def build_delete_request(
+    resource_group_name: str, account_name: str, object_replication_policy_id: str, 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-01-01"))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/objectReplicationPolicies/{objectReplicationPolicyId}",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+        "objectReplicationPolicyId": _SERIALIZER.url(
+            "object_replication_policy_id", object_replication_policy_id, "str", min_length=1
+        ),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="DELETE", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+class ObjectReplicationPoliciesOperations:
+    """
+    .. warning::
+        **DO NOT** instantiate this class directly.
+
+        Instead, you should access the following operations through
+        :class:`~azure.mgmt.storage.v2024_01_01.StorageManagementClient`'s
+        :attr:`object_replication_policies` attribute.
+    """
+
+    models = _models
+
+    def __init__(self, *args, **kwargs):
+        input_args = list(args)
+        self._client = input_args.pop(0) if input_args else kwargs.pop("client")
+        self._config = input_args.pop(0) if input_args else kwargs.pop("config")
+        self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer")
+        self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer")
+        self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version")
+
+    @distributed_trace
+    def list(
+        self, resource_group_name: str, account_name: str, **kwargs: Any
+    ) -> Iterable["_models.ObjectReplicationPolicy"]:
+        """List the object replication policies associated with the storage account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :return: An iterator like instance of either ObjectReplicationPolicy or the result of
+         cls(response)
+        :rtype:
+         ~azure.core.paging.ItemPaged[~azure.mgmt.storage.v2024_01_01.models.ObjectReplicationPolicy]
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.ObjectReplicationPolicies] = kwargs.pop("cls", None)
+
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        def prepare_request(next_link=None):
+            if not next_link:
+
+                _request = build_list_request(
+                    resource_group_name=resource_group_name,
+                    account_name=account_name,
+                    subscription_id=self._config.subscription_id,
+                    api_version=api_version,
+                    headers=_headers,
+                    params=_params,
+                )
+                _request.url = self._client.format_url(_request.url)
+
+            else:
+                # make call to next link with the client's api-version
+                _parsed_next_link = urllib.parse.urlparse(next_link)
+                _next_request_params = case_insensitive_dict(
+                    {
+                        key: [urllib.parse.quote(v) for v in value]
+                        for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items()
+                    }
+                )
+                _next_request_params["api-version"] = self._api_version
+                _request = HttpRequest(
+                    "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
+                )
+                _request.url = self._client.format_url(_request.url)
+                _request.method = "GET"
+            return _request
+
+        def extract_data(pipeline_response):
+            deserialized = self._deserialize("ObjectReplicationPolicies", pipeline_response)
+            list_of_elem = deserialized.value
+            if cls:
+                list_of_elem = cls(list_of_elem)  # type: ignore
+            return None, iter(list_of_elem)
+
+        def get_next(next_link=None):
+            _request = prepare_request(next_link)
+
+            _stream = False
+            pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+                _request, stream=_stream, **kwargs
+            )
+            response = pipeline_response.http_response
+
+            if response.status_code not in [200]:
+                map_error(status_code=response.status_code, response=response, error_map=error_map)
+                error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
+                raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
+
+            return pipeline_response
+
+        return ItemPaged(get_next, extract_data)
+
+    @distributed_trace
+    def get(
+        self, resource_group_name: str, account_name: str, object_replication_policy_id: str, **kwargs: Any
+    ) -> _models.ObjectReplicationPolicy:
+        """Get the object replication policy of the storage account by policy ID.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param object_replication_policy_id: For the destination account, provide the value 'default'.
+         Configure the policy on the destination account first. For the source account, provide the
+         value of the policy ID that is returned when you download the policy that was defined on the
+         destination account. The policy is downloaded as a JSON file. Required.
+        :type object_replication_policy_id: str
+        :return: ObjectReplicationPolicy or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.ObjectReplicationPolicy
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.ObjectReplicationPolicy] = kwargs.pop("cls", None)
+
+        _request = build_get_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            object_replication_policy_id=object_replication_policy_id,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
+            raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @overload
+    def create_or_update(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        object_replication_policy_id: str,
+        properties: _models.ObjectReplicationPolicy,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.ObjectReplicationPolicy:
+        """Create or update the object replication policy of the storage account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param object_replication_policy_id: For the destination account, provide the value 'default'.
+         Configure the policy on the destination account first. For the source account, provide the
+         value of the policy ID that is returned when you download the policy that was defined on the
+         destination account. The policy is downloaded as a JSON file. Required.
+        :type object_replication_policy_id: str
+        :param properties: The object replication policy set to a storage account. A unique policy ID
+         will be created if absent. Required.
+        :type properties: ~azure.mgmt.storage.v2024_01_01.models.ObjectReplicationPolicy
+        :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: ObjectReplicationPolicy or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.ObjectReplicationPolicy
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @overload
+    def create_or_update(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        object_replication_policy_id: str,
+        properties: IO[bytes],
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.ObjectReplicationPolicy:
+        """Create or update the object replication policy of the storage account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param object_replication_policy_id: For the destination account, provide the value 'default'.
+         Configure the policy on the destination account first. For the source account, provide the
+         value of the policy ID that is returned when you download the policy that was defined on the
+         destination account. The policy is downloaded as a JSON file. Required.
+        :type object_replication_policy_id: str
+        :param properties: The object replication policy set to a storage account. A unique policy ID
+         will be created if absent. Required.
+        :type properties: IO[bytes]
+        :keyword content_type: Body Parameter content-type. Content type parameter for binary body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: ObjectReplicationPolicy or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.ObjectReplicationPolicy
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @distributed_trace
+    def create_or_update(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        object_replication_policy_id: str,
+        properties: Union[_models.ObjectReplicationPolicy, IO[bytes]],
+        **kwargs: Any
+    ) -> _models.ObjectReplicationPolicy:
+        """Create or update the object replication policy of the storage account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param object_replication_policy_id: For the destination account, provide the value 'default'.
+         Configure the policy on the destination account first. For the source account, provide the
+         value of the policy ID that is returned when you download the policy that was defined on the
+         destination account. The policy is downloaded as a JSON file. Required.
+        :type object_replication_policy_id: str
+        :param properties: The object replication policy set to a storage account. A unique policy ID
+         will be created if absent. Is either a ObjectReplicationPolicy type or a IO[bytes] type.
+         Required.
+        :type properties: ~azure.mgmt.storage.v2024_01_01.models.ObjectReplicationPolicy or IO[bytes]
+        :return: ObjectReplicationPolicy or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.ObjectReplicationPolicy
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _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", self._api_version or "2024-01-01"))
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+        cls: ClsType[_models.ObjectReplicationPolicy] = kwargs.pop("cls", None)
+
+        content_type = content_type or "application/json"
+        _json = None
+        _content = None
+        if isinstance(properties, (IOBase, bytes)):
+            _content = properties
+        else:
+            _json = self._serialize.body(properties, "ObjectReplicationPolicy")
+
+        _request = build_create_or_update_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            object_replication_policy_id=object_replication_policy_id,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            content_type=content_type,
+            json=_json,
+            content=_content,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
+            raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("ObjectReplicationPolicy", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @distributed_trace
+    def delete(  # pylint: disable=inconsistent-return-statements
+        self, resource_group_name: str, account_name: str, object_replication_policy_id: str, **kwargs: Any
+    ) -> None:
+        """Deletes the object replication policy associated with the specified storage account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param object_replication_policy_id: For the destination account, provide the value 'default'.
+         Configure the policy on the destination account first. For the source account, provide the
+         value of the policy ID that is returned when you download the policy that was defined on the
+         destination account. The policy is downloaded as a JSON file. Required.
+        :type object_replication_policy_id: str
+        :return: None or the result of cls(response)
+        :rtype: None
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[None] = kwargs.pop("cls", None)
+
+        _request = build_delete_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            object_replication_policy_id=object_replication_policy_id,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200, 204]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
+            raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
+
+        if cls:
+            return cls(pipeline_response, None, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/operations/_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/operations/_operations.py
new file mode 100644
index 000000000000..bd4a2c8cb9dd
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/operations/_operations.py
@@ -0,0 +1,151 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+import sys
+from typing import Any, Callable, Dict, Iterable, Optional, TypeVar
+import urllib.parse
+
+from azure.core.exceptions import (
+    ClientAuthenticationError,
+    HttpResponseError,
+    ResourceExistsError,
+    ResourceNotFoundError,
+    ResourceNotModifiedError,
+    map_error,
+)
+from azure.core.paging import ItemPaged
+from azure.core.pipeline import PipelineResponse
+from azure.core.rest import HttpRequest, HttpResponse
+from azure.core.tracing.decorator import distributed_trace
+from azure.core.utils import case_insensitive_dict
+from azure.mgmt.core.exceptions import ARMErrorFormat
+
+from .. import models as _models
+from ..._serialization import Serializer
+
+if sys.version_info >= (3, 9):
+    from collections.abc import MutableMapping
+else:
+    from typing import MutableMapping  # type: ignore
+T = TypeVar("T")
+ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
+
+_SERIALIZER = Serializer()
+_SERIALIZER.client_side_validation = False
+
+
+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-01-01"))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop("template_url", "/providers/Microsoft.Storage/operations")
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+class Operations:
+    """
+    .. warning::
+        **DO NOT** instantiate this class directly.
+
+        Instead, you should access the following operations through
+        :class:`~azure.mgmt.storage.v2024_01_01.StorageManagementClient`'s
+        :attr:`operations` attribute.
+    """
+
+    models = _models
+
+    def __init__(self, *args, **kwargs):
+        input_args = list(args)
+        self._client = input_args.pop(0) if input_args else kwargs.pop("client")
+        self._config = input_args.pop(0) if input_args else kwargs.pop("config")
+        self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer")
+        self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer")
+        self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version")
+
+    @distributed_trace
+    def list(self, **kwargs: Any) -> Iterable["_models.Operation"]:
+        """Lists all of the available Storage Rest API operations.
+
+        :return: An iterator like instance of either Operation or the result of cls(response)
+        :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.storage.v2024_01_01.models.Operation]
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None)
+
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        def prepare_request(next_link=None):
+            if not next_link:
+
+                _request = build_list_request(
+                    api_version=api_version,
+                    headers=_headers,
+                    params=_params,
+                )
+                _request.url = self._client.format_url(_request.url)
+
+            else:
+                # make call to next link with the client's api-version
+                _parsed_next_link = urllib.parse.urlparse(next_link)
+                _next_request_params = case_insensitive_dict(
+                    {
+                        key: [urllib.parse.quote(v) for v in value]
+                        for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items()
+                    }
+                )
+                _next_request_params["api-version"] = self._api_version
+                _request = HttpRequest(
+                    "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
+                )
+                _request.url = self._client.format_url(_request.url)
+                _request.method = "GET"
+            return _request
+
+        def extract_data(pipeline_response):
+            deserialized = self._deserialize("OperationListResult", pipeline_response)
+            list_of_elem = deserialized.value
+            if cls:
+                list_of_elem = cls(list_of_elem)  # type: ignore
+            return None, iter(list_of_elem)
+
+        def get_next(next_link=None):
+            _request = prepare_request(next_link)
+
+            _stream = False
+            pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+                _request, stream=_stream, **kwargs
+            )
+            response = pipeline_response.http_response
+
+            if response.status_code not in [200]:
+                map_error(status_code=response.status_code, response=response, error_map=error_map)
+                raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+            return pipeline_response
+
+        return ItemPaged(get_next, extract_data)
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/operations/_patch.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/operations/_patch.py
new file mode 100644
index 000000000000..f7dd32510333
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/operations/_patch.py
@@ -0,0 +1,20 @@
+# ------------------------------------
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+# ------------------------------------
+"""Customize generated code here.
+
+Follow our quickstart for examples: https://aka.ms/azsdk/python/dpcodegen/python/customize
+"""
+from typing import List
+
+__all__: List[str] = []  # Add all objects you want publicly available to users at this package level
+
+
+def patch_sdk():
+    """Do not remove from this file.
+
+    `patch_sdk` is a last resort escape hatch that allows you to do customizations
+    you can't accomplish using the techniques described in
+    https://aka.ms/azsdk/python/dpcodegen/python/customize
+    """
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/operations/_private_endpoint_connections_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/operations/_private_endpoint_connections_operations.py
new file mode 100644
index 000000000000..ec96250524c8
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/operations/_private_endpoint_connections_operations.py
@@ -0,0 +1,583 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+from io import IOBase
+import sys
+from typing import Any, Callable, Dict, IO, Iterable, Optional, TypeVar, Union, overload
+import urllib.parse
+
+from azure.core.exceptions import (
+    ClientAuthenticationError,
+    HttpResponseError,
+    ResourceExistsError,
+    ResourceNotFoundError,
+    ResourceNotModifiedError,
+    map_error,
+)
+from azure.core.paging import ItemPaged
+from azure.core.pipeline import PipelineResponse
+from azure.core.rest import HttpRequest, HttpResponse
+from azure.core.tracing.decorator import distributed_trace
+from azure.core.utils import case_insensitive_dict
+from azure.mgmt.core.exceptions import ARMErrorFormat
+
+from .. import models as _models
+from ..._serialization import Serializer
+
+if sys.version_info >= (3, 9):
+    from collections.abc import MutableMapping
+else:
+    from typing import MutableMapping  # type: ignore
+T = TypeVar("T")
+ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
+
+_SERIALIZER = Serializer()
+_SERIALIZER.client_side_validation = False
+
+
+def build_list_request(resource_group_name: str, account_name: str, 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-01-01"))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/privateEndpointConnections",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+def build_get_request(
+    resource_group_name: str,
+    account_name: str,
+    private_endpoint_connection_name: str,
+    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-01-01"))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/privateEndpointConnections/{privateEndpointConnectionName}",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+        "privateEndpointConnectionName": _SERIALIZER.url(
+            "private_endpoint_connection_name", private_endpoint_connection_name, "str"
+        ),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+def build_put_request(
+    resource_group_name: str,
+    account_name: str,
+    private_endpoint_connection_name: str,
+    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-01-01"))
+    content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/privateEndpointConnections/{privateEndpointConnectionName}",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+        "privateEndpointConnectionName": _SERIALIZER.url(
+            "private_endpoint_connection_name", private_endpoint_connection_name, "str"
+        ),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    if content_type is not None:
+        _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str")
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="PUT", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+def build_delete_request(
+    resource_group_name: str,
+    account_name: str,
+    private_endpoint_connection_name: str,
+    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-01-01"))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/privateEndpointConnections/{privateEndpointConnectionName}",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+        "privateEndpointConnectionName": _SERIALIZER.url(
+            "private_endpoint_connection_name", private_endpoint_connection_name, "str"
+        ),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="DELETE", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+class PrivateEndpointConnectionsOperations:
+    """
+    .. warning::
+        **DO NOT** instantiate this class directly.
+
+        Instead, you should access the following operations through
+        :class:`~azure.mgmt.storage.v2024_01_01.StorageManagementClient`'s
+        :attr:`private_endpoint_connections` attribute.
+    """
+
+    models = _models
+
+    def __init__(self, *args, **kwargs):
+        input_args = list(args)
+        self._client = input_args.pop(0) if input_args else kwargs.pop("client")
+        self._config = input_args.pop(0) if input_args else kwargs.pop("config")
+        self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer")
+        self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer")
+        self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version")
+
+    @distributed_trace
+    def list(
+        self, resource_group_name: str, account_name: str, **kwargs: Any
+    ) -> Iterable["_models.PrivateEndpointConnection"]:
+        """List all the private endpoint connections associated with the storage account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :return: An iterator like instance of either PrivateEndpointConnection or the result of
+         cls(response)
+        :rtype:
+         ~azure.core.paging.ItemPaged[~azure.mgmt.storage.v2024_01_01.models.PrivateEndpointConnection]
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.PrivateEndpointConnectionListResult] = kwargs.pop("cls", None)
+
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        def prepare_request(next_link=None):
+            if not next_link:
+
+                _request = build_list_request(
+                    resource_group_name=resource_group_name,
+                    account_name=account_name,
+                    subscription_id=self._config.subscription_id,
+                    api_version=api_version,
+                    headers=_headers,
+                    params=_params,
+                )
+                _request.url = self._client.format_url(_request.url)
+
+            else:
+                # make call to next link with the client's api-version
+                _parsed_next_link = urllib.parse.urlparse(next_link)
+                _next_request_params = case_insensitive_dict(
+                    {
+                        key: [urllib.parse.quote(v) for v in value]
+                        for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items()
+                    }
+                )
+                _next_request_params["api-version"] = self._api_version
+                _request = HttpRequest(
+                    "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
+                )
+                _request.url = self._client.format_url(_request.url)
+                _request.method = "GET"
+            return _request
+
+        def extract_data(pipeline_response):
+            deserialized = self._deserialize("PrivateEndpointConnectionListResult", pipeline_response)
+            list_of_elem = deserialized.value
+            if cls:
+                list_of_elem = cls(list_of_elem)  # type: ignore
+            return None, iter(list_of_elem)
+
+        def get_next(next_link=None):
+            _request = prepare_request(next_link)
+
+            _stream = False
+            pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+                _request, stream=_stream, **kwargs
+            )
+            response = pipeline_response.http_response
+
+            if response.status_code not in [200]:
+                map_error(status_code=response.status_code, response=response, error_map=error_map)
+                raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+            return pipeline_response
+
+        return ItemPaged(get_next, extract_data)
+
+    @distributed_trace
+    def get(
+        self, resource_group_name: str, account_name: str, private_endpoint_connection_name: str, **kwargs: Any
+    ) -> _models.PrivateEndpointConnection:
+        """Gets the specified private endpoint connection associated with the storage account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param private_endpoint_connection_name: The name of the private endpoint connection associated
+         with the Azure resource. Required.
+        :type private_endpoint_connection_name: str
+        :return: PrivateEndpointConnection or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.PrivateEndpointConnection
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.PrivateEndpointConnection] = kwargs.pop("cls", None)
+
+        _request = build_get_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            private_endpoint_connection_name=private_endpoint_connection_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
+            raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @overload
+    def put(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        private_endpoint_connection_name: str,
+        properties: _models.PrivateEndpointConnection,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.PrivateEndpointConnection:
+        """Update the state of specified private endpoint connection associated with the storage account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param private_endpoint_connection_name: The name of the private endpoint connection associated
+         with the Azure resource. Required.
+        :type private_endpoint_connection_name: str
+        :param properties: The private endpoint connection properties. Required.
+        :type properties: ~azure.mgmt.storage.v2024_01_01.models.PrivateEndpointConnection
+        :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: PrivateEndpointConnection or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.PrivateEndpointConnection
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @overload
+    def put(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        private_endpoint_connection_name: str,
+        properties: IO[bytes],
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.PrivateEndpointConnection:
+        """Update the state of specified private endpoint connection associated with the storage account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param private_endpoint_connection_name: The name of the private endpoint connection associated
+         with the Azure resource. Required.
+        :type private_endpoint_connection_name: str
+        :param properties: The private endpoint connection properties. Required.
+        :type properties: IO[bytes]
+        :keyword content_type: Body Parameter content-type. Content type parameter for binary body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: PrivateEndpointConnection or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.PrivateEndpointConnection
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @distributed_trace
+    def put(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        private_endpoint_connection_name: str,
+        properties: Union[_models.PrivateEndpointConnection, IO[bytes]],
+        **kwargs: Any
+    ) -> _models.PrivateEndpointConnection:
+        """Update the state of specified private endpoint connection associated with the storage account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param private_endpoint_connection_name: The name of the private endpoint connection associated
+         with the Azure resource. Required.
+        :type private_endpoint_connection_name: str
+        :param properties: The private endpoint connection properties. Is either a
+         PrivateEndpointConnection type or a IO[bytes] type. Required.
+        :type properties: ~azure.mgmt.storage.v2024_01_01.models.PrivateEndpointConnection or IO[bytes]
+        :return: PrivateEndpointConnection or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.PrivateEndpointConnection
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _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", self._api_version or "2024-01-01"))
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+        cls: ClsType[_models.PrivateEndpointConnection] = kwargs.pop("cls", None)
+
+        content_type = content_type or "application/json"
+        _json = None
+        _content = None
+        if isinstance(properties, (IOBase, bytes)):
+            _content = properties
+        else:
+            _json = self._serialize.body(properties, "PrivateEndpointConnection")
+
+        _request = build_put_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            private_endpoint_connection_name=private_endpoint_connection_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            content_type=content_type,
+            json=_json,
+            content=_content,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
+            raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("PrivateEndpointConnection", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @distributed_trace
+    def delete(  # pylint: disable=inconsistent-return-statements
+        self, resource_group_name: str, account_name: str, private_endpoint_connection_name: str, **kwargs: Any
+    ) -> None:
+        """Deletes the specified private endpoint connection associated with the storage account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param private_endpoint_connection_name: The name of the private endpoint connection associated
+         with the Azure resource. Required.
+        :type private_endpoint_connection_name: str
+        :return: None or the result of cls(response)
+        :rtype: None
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[None] = kwargs.pop("cls", None)
+
+        _request = build_delete_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            private_endpoint_connection_name=private_endpoint_connection_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200, 204]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
+            raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
+
+        if cls:
+            return cls(pipeline_response, None, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/operations/_private_link_resources_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/operations/_private_link_resources_operations.py
new file mode 100644
index 000000000000..c548968b3d22
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/operations/_private_link_resources_operations.py
@@ -0,0 +1,151 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+import sys
+from typing import Any, Callable, Dict, Optional, TypeVar
+
+from azure.core.exceptions import (
+    ClientAuthenticationError,
+    HttpResponseError,
+    ResourceExistsError,
+    ResourceNotFoundError,
+    ResourceNotModifiedError,
+    map_error,
+)
+from azure.core.pipeline import PipelineResponse
+from azure.core.rest import HttpRequest, HttpResponse
+from azure.core.tracing.decorator import distributed_trace
+from azure.core.utils import case_insensitive_dict
+from azure.mgmt.core.exceptions import ARMErrorFormat
+
+from .. import models as _models
+from ..._serialization import Serializer
+
+if sys.version_info >= (3, 9):
+    from collections.abc import MutableMapping
+else:
+    from typing import MutableMapping  # type: ignore
+T = TypeVar("T")
+ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
+
+_SERIALIZER = Serializer()
+_SERIALIZER.client_side_validation = False
+
+
+def build_list_by_storage_account_request(
+    resource_group_name: str, account_name: str, 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-01-01"))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/privateLinkResources",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+class PrivateLinkResourcesOperations:
+    """
+    .. warning::
+        **DO NOT** instantiate this class directly.
+
+        Instead, you should access the following operations through
+        :class:`~azure.mgmt.storage.v2024_01_01.StorageManagementClient`'s
+        :attr:`private_link_resources` attribute.
+    """
+
+    models = _models
+
+    def __init__(self, *args, **kwargs):
+        input_args = list(args)
+        self._client = input_args.pop(0) if input_args else kwargs.pop("client")
+        self._config = input_args.pop(0) if input_args else kwargs.pop("config")
+        self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer")
+        self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer")
+        self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version")
+
+    @distributed_trace
+    def list_by_storage_account(
+        self, resource_group_name: str, account_name: str, **kwargs: Any
+    ) -> _models.PrivateLinkResourceListResult:
+        """Gets the private link resources that need to be created for a storage account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :return: PrivateLinkResourceListResult or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.PrivateLinkResourceListResult
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.PrivateLinkResourceListResult] = kwargs.pop("cls", None)
+
+        _request = build_list_by_storage_account_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("PrivateLinkResourceListResult", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/operations/_queue_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/operations/_queue_operations.py
new file mode 100644
index 000000000000..f32923ab4d9d
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/operations/_queue_operations.py
@@ -0,0 +1,815 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+from io import IOBase
+import sys
+from typing import Any, Callable, Dict, IO, Iterable, Optional, TypeVar, Union, overload
+import urllib.parse
+
+from azure.core.exceptions import (
+    ClientAuthenticationError,
+    HttpResponseError,
+    ResourceExistsError,
+    ResourceNotFoundError,
+    ResourceNotModifiedError,
+    map_error,
+)
+from azure.core.paging import ItemPaged
+from azure.core.pipeline import PipelineResponse
+from azure.core.rest import HttpRequest, HttpResponse
+from azure.core.tracing.decorator import distributed_trace
+from azure.core.utils import case_insensitive_dict
+from azure.mgmt.core.exceptions import ARMErrorFormat
+
+from .. import models as _models
+from ..._serialization import Serializer
+
+if sys.version_info >= (3, 9):
+    from collections.abc import MutableMapping
+else:
+    from typing import MutableMapping  # type: ignore
+T = TypeVar("T")
+ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
+
+_SERIALIZER = Serializer()
+_SERIALIZER.client_side_validation = False
+
+
+def build_create_request(
+    resource_group_name: str, account_name: str, queue_name: str, 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-01-01"))
+    content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/queueServices/default/queues/{queueName}",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+        "queueName": _SERIALIZER.url(
+            "queue_name",
+            queue_name,
+            "str",
+            max_length=63,
+            min_length=3,
+            pattern=r"^[a-z0-9]([a-z0-9]|(-(?!-))){1,61}[a-z0-9]$",
+        ),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    if content_type is not None:
+        _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str")
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="PUT", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+def build_update_request(
+    resource_group_name: str, account_name: str, queue_name: str, 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-01-01"))
+    content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/queueServices/default/queues/{queueName}",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+        "queueName": _SERIALIZER.url(
+            "queue_name",
+            queue_name,
+            "str",
+            max_length=63,
+            min_length=3,
+            pattern=r"^[a-z0-9]([a-z0-9]|(-(?!-))){1,61}[a-z0-9]$",
+        ),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    if content_type is not None:
+        _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str")
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="PATCH", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+def build_get_request(
+    resource_group_name: str, account_name: str, queue_name: str, 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-01-01"))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/queueServices/default/queues/{queueName}",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+        "queueName": _SERIALIZER.url(
+            "queue_name",
+            queue_name,
+            "str",
+            max_length=63,
+            min_length=3,
+            pattern=r"^[a-z0-9]([a-z0-9]|(-(?!-))){1,61}[a-z0-9]$",
+        ),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+def build_delete_request(
+    resource_group_name: str, account_name: str, queue_name: str, 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-01-01"))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/queueServices/default/queues/{queueName}",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+        "queueName": _SERIALIZER.url(
+            "queue_name",
+            queue_name,
+            "str",
+            max_length=63,
+            min_length=3,
+            pattern=r"^[a-z0-9]([a-z0-9]|(-(?!-))){1,61}[a-z0-9]$",
+        ),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="DELETE", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+def build_list_request(
+    resource_group_name: str,
+    account_name: str,
+    subscription_id: str,
+    *,
+    maxpagesize: Optional[str] = None,
+    filter: Optional[str] = None,
+    **kwargs: Any
+) -> HttpRequest:
+    _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
+    _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-01-01"))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/queueServices/default/queues",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+    if maxpagesize is not None:
+        _params["$maxpagesize"] = _SERIALIZER.query("maxpagesize", maxpagesize, "str")
+    if filter is not None:
+        _params["$filter"] = _SERIALIZER.query("filter", filter, "str")
+
+    # Construct headers
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+class QueueOperations:
+    """
+    .. warning::
+        **DO NOT** instantiate this class directly.
+
+        Instead, you should access the following operations through
+        :class:`~azure.mgmt.storage.v2024_01_01.StorageManagementClient`'s
+        :attr:`queue` attribute.
+    """
+
+    models = _models
+
+    def __init__(self, *args, **kwargs):
+        input_args = list(args)
+        self._client = input_args.pop(0) if input_args else kwargs.pop("client")
+        self._config = input_args.pop(0) if input_args else kwargs.pop("config")
+        self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer")
+        self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer")
+        self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version")
+
+    @overload
+    def create(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        queue_name: str,
+        queue: _models.StorageQueue,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.StorageQueue:
+        """Creates a new queue with the specified queue name, under the specified account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param queue_name: A queue name must be unique within a storage account and must be between 3
+         and 63 characters.The name must comprise of lowercase alphanumeric and dash(-) characters only,
+         it should begin and end with an alphanumeric character and it cannot have two consecutive
+         dash(-) characters. Required.
+        :type queue_name: str
+        :param queue: Queue properties and metadata to be created with. Required.
+        :type queue: ~azure.mgmt.storage.v2024_01_01.models.StorageQueue
+        :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: StorageQueue or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.StorageQueue
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @overload
+    def create(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        queue_name: str,
+        queue: IO[bytes],
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.StorageQueue:
+        """Creates a new queue with the specified queue name, under the specified account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param queue_name: A queue name must be unique within a storage account and must be between 3
+         and 63 characters.The name must comprise of lowercase alphanumeric and dash(-) characters only,
+         it should begin and end with an alphanumeric character and it cannot have two consecutive
+         dash(-) characters. Required.
+        :type queue_name: str
+        :param queue: Queue properties and metadata to be created with. Required.
+        :type queue: IO[bytes]
+        :keyword content_type: Body Parameter content-type. Content type parameter for binary body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: StorageQueue or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.StorageQueue
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @distributed_trace
+    def create(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        queue_name: str,
+        queue: Union[_models.StorageQueue, IO[bytes]],
+        **kwargs: Any
+    ) -> _models.StorageQueue:
+        """Creates a new queue with the specified queue name, under the specified account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param queue_name: A queue name must be unique within a storage account and must be between 3
+         and 63 characters.The name must comprise of lowercase alphanumeric and dash(-) characters only,
+         it should begin and end with an alphanumeric character and it cannot have two consecutive
+         dash(-) characters. Required.
+        :type queue_name: str
+        :param queue: Queue properties and metadata to be created with. Is either a StorageQueue type
+         or a IO[bytes] type. Required.
+        :type queue: ~azure.mgmt.storage.v2024_01_01.models.StorageQueue or IO[bytes]
+        :return: StorageQueue or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.StorageQueue
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _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", self._api_version or "2024-01-01"))
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+        cls: ClsType[_models.StorageQueue] = kwargs.pop("cls", None)
+
+        content_type = content_type or "application/json"
+        _json = None
+        _content = None
+        if isinstance(queue, (IOBase, bytes)):
+            _content = queue
+        else:
+            _json = self._serialize.body(queue, "StorageQueue")
+
+        _request = build_create_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            queue_name=queue_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            content_type=content_type,
+            json=_json,
+            content=_content,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("StorageQueue", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @overload
+    def update(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        queue_name: str,
+        queue: _models.StorageQueue,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.StorageQueue:
+        """Creates a new queue with the specified queue name, under the specified account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param queue_name: A queue name must be unique within a storage account and must be between 3
+         and 63 characters.The name must comprise of lowercase alphanumeric and dash(-) characters only,
+         it should begin and end with an alphanumeric character and it cannot have two consecutive
+         dash(-) characters. Required.
+        :type queue_name: str
+        :param queue: Queue properties and metadata to be created with. Required.
+        :type queue: ~azure.mgmt.storage.v2024_01_01.models.StorageQueue
+        :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: StorageQueue or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.StorageQueue
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @overload
+    def update(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        queue_name: str,
+        queue: IO[bytes],
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.StorageQueue:
+        """Creates a new queue with the specified queue name, under the specified account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param queue_name: A queue name must be unique within a storage account and must be between 3
+         and 63 characters.The name must comprise of lowercase alphanumeric and dash(-) characters only,
+         it should begin and end with an alphanumeric character and it cannot have two consecutive
+         dash(-) characters. Required.
+        :type queue_name: str
+        :param queue: Queue properties and metadata to be created with. Required.
+        :type queue: IO[bytes]
+        :keyword content_type: Body Parameter content-type. Content type parameter for binary body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: StorageQueue or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.StorageQueue
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @distributed_trace
+    def update(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        queue_name: str,
+        queue: Union[_models.StorageQueue, IO[bytes]],
+        **kwargs: Any
+    ) -> _models.StorageQueue:
+        """Creates a new queue with the specified queue name, under the specified account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param queue_name: A queue name must be unique within a storage account and must be between 3
+         and 63 characters.The name must comprise of lowercase alphanumeric and dash(-) characters only,
+         it should begin and end with an alphanumeric character and it cannot have two consecutive
+         dash(-) characters. Required.
+        :type queue_name: str
+        :param queue: Queue properties and metadata to be created with. Is either a StorageQueue type
+         or a IO[bytes] type. Required.
+        :type queue: ~azure.mgmt.storage.v2024_01_01.models.StorageQueue or IO[bytes]
+        :return: StorageQueue or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.StorageQueue
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _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", self._api_version or "2024-01-01"))
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+        cls: ClsType[_models.StorageQueue] = kwargs.pop("cls", None)
+
+        content_type = content_type or "application/json"
+        _json = None
+        _content = None
+        if isinstance(queue, (IOBase, bytes)):
+            _content = queue
+        else:
+            _json = self._serialize.body(queue, "StorageQueue")
+
+        _request = build_update_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            queue_name=queue_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            content_type=content_type,
+            json=_json,
+            content=_content,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("StorageQueue", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @distributed_trace
+    def get(self, resource_group_name: str, account_name: str, queue_name: str, **kwargs: Any) -> _models.StorageQueue:
+        """Gets the queue with the specified queue name, under the specified account if it exists.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param queue_name: A queue name must be unique within a storage account and must be between 3
+         and 63 characters.The name must comprise of lowercase alphanumeric and dash(-) characters only,
+         it should begin and end with an alphanumeric character and it cannot have two consecutive
+         dash(-) characters. Required.
+        :type queue_name: str
+        :return: StorageQueue or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.StorageQueue
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.StorageQueue] = kwargs.pop("cls", None)
+
+        _request = build_get_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            queue_name=queue_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("StorageQueue", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @distributed_trace
+    def delete(  # pylint: disable=inconsistent-return-statements
+        self, resource_group_name: str, account_name: str, queue_name: str, **kwargs: Any
+    ) -> None:
+        """Deletes the queue with the specified queue name, under the specified account if it exists.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param queue_name: A queue name must be unique within a storage account and must be between 3
+         and 63 characters.The name must comprise of lowercase alphanumeric and dash(-) characters only,
+         it should begin and end with an alphanumeric character and it cannot have two consecutive
+         dash(-) characters. Required.
+        :type queue_name: str
+        :return: None or the result of cls(response)
+        :rtype: None
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[None] = kwargs.pop("cls", None)
+
+        _request = build_delete_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            queue_name=queue_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [204]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        if cls:
+            return cls(pipeline_response, None, {})  # type: ignore
+
+    @distributed_trace
+    def list(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        maxpagesize: Optional[str] = None,
+        filter: Optional[str] = None,
+        **kwargs: Any
+    ) -> Iterable["_models.ListQueue"]:
+        """Gets a list of all the queues under the specified storage account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param maxpagesize: Optional, a maximum number of queues that should be included in a list
+         queue response. Default value is None.
+        :type maxpagesize: str
+        :param filter: Optional, When specified, only the queues with a name starting with the given
+         filter will be listed. Default value is None.
+        :type filter: str
+        :return: An iterator like instance of either ListQueue or the result of cls(response)
+        :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.storage.v2024_01_01.models.ListQueue]
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.ListQueueResource] = kwargs.pop("cls", None)
+
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        def prepare_request(next_link=None):
+            if not next_link:
+
+                _request = build_list_request(
+                    resource_group_name=resource_group_name,
+                    account_name=account_name,
+                    subscription_id=self._config.subscription_id,
+                    maxpagesize=maxpagesize,
+                    filter=filter,
+                    api_version=api_version,
+                    headers=_headers,
+                    params=_params,
+                )
+                _request.url = self._client.format_url(_request.url)
+
+            else:
+                # make call to next link with the client's api-version
+                _parsed_next_link = urllib.parse.urlparse(next_link)
+                _next_request_params = case_insensitive_dict(
+                    {
+                        key: [urllib.parse.quote(v) for v in value]
+                        for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items()
+                    }
+                )
+                _next_request_params["api-version"] = self._api_version
+                _request = HttpRequest(
+                    "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
+                )
+                _request.url = self._client.format_url(_request.url)
+                _request.method = "GET"
+            return _request
+
+        def extract_data(pipeline_response):
+            deserialized = self._deserialize("ListQueueResource", pipeline_response)
+            list_of_elem = deserialized.value
+            if cls:
+                list_of_elem = cls(list_of_elem)  # type: ignore
+            return deserialized.next_link or None, iter(list_of_elem)
+
+        def get_next(next_link=None):
+            _request = prepare_request(next_link)
+
+            _stream = False
+            pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+                _request, stream=_stream, **kwargs
+            )
+            response = pipeline_response.http_response
+
+            if response.status_code not in [200]:
+                map_error(status_code=response.status_code, response=response, error_map=error_map)
+                raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+            return pipeline_response
+
+        return ItemPaged(get_next, extract_data)
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/operations/_queue_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/operations/_queue_services_operations.py
new file mode 100644
index 000000000000..aa64d0bfdc14
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/operations/_queue_services_operations.py
@@ -0,0 +1,431 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+from io import IOBase
+import sys
+from typing import Any, Callable, Dict, IO, Literal, Optional, TypeVar, Union, overload
+
+from azure.core.exceptions import (
+    ClientAuthenticationError,
+    HttpResponseError,
+    ResourceExistsError,
+    ResourceNotFoundError,
+    ResourceNotModifiedError,
+    map_error,
+)
+from azure.core.pipeline import PipelineResponse
+from azure.core.rest import HttpRequest, HttpResponse
+from azure.core.tracing.decorator import distributed_trace
+from azure.core.utils import case_insensitive_dict
+from azure.mgmt.core.exceptions import ARMErrorFormat
+
+from .. import models as _models
+from ..._serialization import Serializer
+
+if sys.version_info >= (3, 9):
+    from collections.abc import MutableMapping
+else:
+    from typing import MutableMapping  # type: ignore
+T = TypeVar("T")
+ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
+
+_SERIALIZER = Serializer()
+_SERIALIZER.client_side_validation = False
+
+
+def build_list_request(resource_group_name: str, account_name: str, 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-01-01"))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/queueServices",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+def build_set_service_properties_request(
+    resource_group_name: str, account_name: str, 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-01-01"))
+    queue_service_name: Literal["default"] = kwargs.pop("queue_service_name", "default")
+    content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/queueServices/{queueServiceName}",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+        "queueServiceName": _SERIALIZER.url("queue_service_name", queue_service_name, "str"),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    if content_type is not None:
+        _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str")
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="PUT", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+def build_get_service_properties_request(
+    resource_group_name: str, account_name: str, 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-01-01"))
+    queue_service_name: Literal["default"] = kwargs.pop("queue_service_name", "default")
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/queueServices/{queueServiceName}",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+        "queueServiceName": _SERIALIZER.url("queue_service_name", queue_service_name, "str"),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+class QueueServicesOperations:
+    """
+    .. warning::
+        **DO NOT** instantiate this class directly.
+
+        Instead, you should access the following operations through
+        :class:`~azure.mgmt.storage.v2024_01_01.StorageManagementClient`'s
+        :attr:`queue_services` attribute.
+    """
+
+    models = _models
+
+    def __init__(self, *args, **kwargs):
+        input_args = list(args)
+        self._client = input_args.pop(0) if input_args else kwargs.pop("client")
+        self._config = input_args.pop(0) if input_args else kwargs.pop("config")
+        self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer")
+        self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer")
+        self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version")
+
+    @distributed_trace
+    def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _models.ListQueueServices:
+        """List all queue services for the storage account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :return: ListQueueServices or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.ListQueueServices
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.ListQueueServices] = kwargs.pop("cls", None)
+
+        _request = build_list_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("ListQueueServices", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @overload
+    def set_service_properties(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        parameters: _models.QueueServiceProperties,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.QueueServiceProperties:
+        """Sets the properties of a storage account’s Queue service, including properties for Storage
+        Analytics and CORS (Cross-Origin Resource Sharing) rules.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param parameters: The properties of a storage account’s Queue service, only properties for
+         Storage Analytics and CORS (Cross-Origin Resource Sharing) rules can be specified. Required.
+        :type parameters: ~azure.mgmt.storage.v2024_01_01.models.QueueServiceProperties
+        :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: QueueServiceProperties or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.QueueServiceProperties
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @overload
+    def set_service_properties(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        parameters: IO[bytes],
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.QueueServiceProperties:
+        """Sets the properties of a storage account’s Queue service, including properties for Storage
+        Analytics and CORS (Cross-Origin Resource Sharing) rules.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param parameters: The properties of a storage account’s Queue service, only properties for
+         Storage Analytics and CORS (Cross-Origin Resource Sharing) rules can be specified. Required.
+        :type parameters: IO[bytes]
+        :keyword content_type: Body Parameter content-type. Content type parameter for binary body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: QueueServiceProperties or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.QueueServiceProperties
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @distributed_trace
+    def set_service_properties(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        parameters: Union[_models.QueueServiceProperties, IO[bytes]],
+        **kwargs: Any
+    ) -> _models.QueueServiceProperties:
+        """Sets the properties of a storage account’s Queue service, including properties for Storage
+        Analytics and CORS (Cross-Origin Resource Sharing) rules.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param parameters: The properties of a storage account’s Queue service, only properties for
+         Storage Analytics and CORS (Cross-Origin Resource Sharing) rules can be specified. Is either a
+         QueueServiceProperties type or a IO[bytes] type. Required.
+        :type parameters: ~azure.mgmt.storage.v2024_01_01.models.QueueServiceProperties or IO[bytes]
+        :return: QueueServiceProperties or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.QueueServiceProperties
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _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", self._api_version or "2024-01-01"))
+        queue_service_name: Literal["default"] = kwargs.pop("queue_service_name", "default")
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+        cls: ClsType[_models.QueueServiceProperties] = kwargs.pop("cls", None)
+
+        content_type = content_type or "application/json"
+        _json = None
+        _content = None
+        if isinstance(parameters, (IOBase, bytes)):
+            _content = parameters
+        else:
+            _json = self._serialize.body(parameters, "QueueServiceProperties")
+
+        _request = build_set_service_properties_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            queue_service_name=queue_service_name,
+            content_type=content_type,
+            json=_json,
+            content=_content,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("QueueServiceProperties", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @distributed_trace
+    def get_service_properties(
+        self, resource_group_name: str, account_name: str, **kwargs: Any
+    ) -> _models.QueueServiceProperties:
+        """Gets the properties of a storage account’s Queue service, including properties for Storage
+        Analytics and CORS (Cross-Origin Resource Sharing) rules.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :return: QueueServiceProperties or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.QueueServiceProperties
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        queue_service_name: Literal["default"] = kwargs.pop("queue_service_name", "default")
+        cls: ClsType[_models.QueueServiceProperties] = kwargs.pop("cls", None)
+
+        _request = build_get_service_properties_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            queue_service_name=queue_service_name,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("QueueServiceProperties", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/operations/_skus_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/operations/_skus_operations.py
new file mode 100644
index 000000000000..e4fe6195fdf6
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/operations/_skus_operations.py
@@ -0,0 +1,157 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+import sys
+from typing import Any, Callable, Dict, Iterable, Optional, TypeVar
+import urllib.parse
+
+from azure.core.exceptions import (
+    ClientAuthenticationError,
+    HttpResponseError,
+    ResourceExistsError,
+    ResourceNotFoundError,
+    ResourceNotModifiedError,
+    map_error,
+)
+from azure.core.paging import ItemPaged
+from azure.core.pipeline import PipelineResponse
+from azure.core.rest import HttpRequest, HttpResponse
+from azure.core.tracing.decorator import distributed_trace
+from azure.core.utils import case_insensitive_dict
+from azure.mgmt.core.exceptions import ARMErrorFormat
+
+from .. import models as _models
+from ..._serialization import Serializer
+
+if sys.version_info >= (3, 9):
+    from collections.abc import MutableMapping
+else:
+    from typing import MutableMapping  # type: ignore
+T = TypeVar("T")
+ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
+
+_SERIALIZER = Serializer()
+_SERIALIZER.client_side_validation = False
+
+
+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-01-01"))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/providers/Microsoft.Storage/skus")
+    path_format_arguments = {
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+class SkusOperations:
+    """
+    .. warning::
+        **DO NOT** instantiate this class directly.
+
+        Instead, you should access the following operations through
+        :class:`~azure.mgmt.storage.v2024_01_01.StorageManagementClient`'s
+        :attr:`skus` attribute.
+    """
+
+    models = _models
+
+    def __init__(self, *args, **kwargs):
+        input_args = list(args)
+        self._client = input_args.pop(0) if input_args else kwargs.pop("client")
+        self._config = input_args.pop(0) if input_args else kwargs.pop("config")
+        self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer")
+        self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer")
+        self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version")
+
+    @distributed_trace
+    def list(self, **kwargs: Any) -> Iterable["_models.SkuInformation"]:
+        """Lists the available SKUs supported by Microsoft.Storage for given subscription.
+
+        :return: An iterator like instance of either SkuInformation or the result of cls(response)
+        :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.storage.v2024_01_01.models.SkuInformation]
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.StorageSkuListResult] = kwargs.pop("cls", None)
+
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        def prepare_request(next_link=None):
+            if not next_link:
+
+                _request = build_list_request(
+                    subscription_id=self._config.subscription_id,
+                    api_version=api_version,
+                    headers=_headers,
+                    params=_params,
+                )
+                _request.url = self._client.format_url(_request.url)
+
+            else:
+                # make call to next link with the client's api-version
+                _parsed_next_link = urllib.parse.urlparse(next_link)
+                _next_request_params = case_insensitive_dict(
+                    {
+                        key: [urllib.parse.quote(v) for v in value]
+                        for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items()
+                    }
+                )
+                _next_request_params["api-version"] = self._api_version
+                _request = HttpRequest(
+                    "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
+                )
+                _request.url = self._client.format_url(_request.url)
+                _request.method = "GET"
+            return _request
+
+        def extract_data(pipeline_response):
+            deserialized = self._deserialize("StorageSkuListResult", pipeline_response)
+            list_of_elem = deserialized.value
+            if cls:
+                list_of_elem = cls(list_of_elem)  # type: ignore
+            return None, iter(list_of_elem)
+
+        def get_next(next_link=None):
+            _request = prepare_request(next_link)
+
+            _stream = False
+            pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+                _request, stream=_stream, **kwargs
+            )
+            response = pipeline_response.http_response
+
+            if response.status_code not in [200]:
+                map_error(status_code=response.status_code, response=response, error_map=error_map)
+                raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+            return pipeline_response
+
+        return ItemPaged(get_next, extract_data)
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/operations/_storage_accounts_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/operations/_storage_accounts_operations.py
new file mode 100644
index 000000000000..689c8bf92afd
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/operations/_storage_accounts_operations.py
@@ -0,0 +1,2822 @@
+# 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.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+from io import IOBase
+import sys
+from typing import Any, Callable, Dict, IO, Iterable, Iterator, Literal, Optional, TypeVar, Union, cast, overload
+import urllib.parse
+
+from azure.core.exceptions import (
+    ClientAuthenticationError,
+    HttpResponseError,
+    ResourceExistsError,
+    ResourceNotFoundError,
+    ResourceNotModifiedError,
+    StreamClosedError,
+    StreamConsumedError,
+    map_error,
+)
+from azure.core.paging import ItemPaged
+from azure.core.pipeline import PipelineResponse
+from azure.core.polling import LROPoller, NoPolling, PollingMethod
+from azure.core.rest import HttpRequest, HttpResponse
+from azure.core.tracing.decorator import distributed_trace
+from azure.core.utils import case_insensitive_dict
+from azure.mgmt.core.exceptions import ARMErrorFormat
+from azure.mgmt.core.polling.arm_polling import ARMPolling
+
+from .. import models as _models
+from ..._serialization import Serializer
+
+if sys.version_info >= (3, 9):
+    from collections.abc import MutableMapping
+else:
+    from typing import MutableMapping  # type: ignore
+T = TypeVar("T")
+ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
+
+_SERIALIZER = Serializer()
+_SERIALIZER.client_side_validation = False
+
+
+def build_check_name_availability_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-01-01"))
+    content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url", "/subscriptions/{subscriptionId}/providers/Microsoft.Storage/checkNameAvailability"
+    )
+    path_format_arguments = {
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    if content_type is not None:
+        _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str")
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="POST", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+def build_create_request(
+    resource_group_name: str, account_name: str, 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-01-01"))
+    content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    if content_type is not None:
+        _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str")
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="PUT", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+def build_delete_request(
+    resource_group_name: str, account_name: str, subscription_id: str, **kwargs: Any
+) -> HttpRequest:
+    _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-01-01"))
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    return HttpRequest(method="DELETE", url=_url, params=_params, **kwargs)
+
+
+def build_get_properties_request(
+    resource_group_name: str,
+    account_name: str,
+    subscription_id: str,
+    *,
+    expand: Optional[Union[str, _models.StorageAccountExpand]] = None,
+    **kwargs: Any
+) -> HttpRequest:
+    _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
+    _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-01-01"))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+    if expand is not None:
+        _params["$expand"] = _SERIALIZER.query("expand", expand, "str")
+
+    # Construct headers
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+def build_update_request(
+    resource_group_name: str, account_name: str, 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-01-01"))
+    content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    if content_type is not None:
+        _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str")
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="PATCH", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+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-01-01"))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/providers/Microsoft.Storage/storageAccounts")
+    path_format_arguments = {
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+def build_list_by_resource_group_request(resource_group_name: str, 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-01-01"))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+def build_list_keys_request(
+    resource_group_name: str,
+    account_name: str,
+    subscription_id: str,
+    *,
+    expand: Literal["kerb"] = "kerb",
+    **kwargs: Any
+) -> HttpRequest:
+    _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
+    _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-01-01"))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/listKeys",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+    if expand is not None:
+        _params["$expand"] = _SERIALIZER.query("expand", expand, "str")
+
+    # Construct headers
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="POST", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+def build_regenerate_key_request(
+    resource_group_name: str, account_name: str, 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-01-01"))
+    content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/regenerateKey",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    if content_type is not None:
+        _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str")
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="POST", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+def build_list_account_sas_request(
+    resource_group_name: str, account_name: str, 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-01-01"))
+    content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/ListAccountSas",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    if content_type is not None:
+        _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str")
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="POST", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+def build_list_service_sas_request(
+    resource_group_name: str, account_name: str, 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-01-01"))
+    content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/ListServiceSas",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    if content_type is not None:
+        _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str")
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="POST", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+def build_failover_request(
+    resource_group_name: str,
+    account_name: str,
+    subscription_id: str,
+    *,
+    failover_type: Literal["Planned"] = "Planned",
+    **kwargs: Any
+) -> HttpRequest:
+    _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-01-01"))
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/failover",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+    if failover_type is not None:
+        _params["failoverType"] = _SERIALIZER.query("failover_type", failover_type, "str")
+
+    return HttpRequest(method="POST", url=_url, params=_params, **kwargs)
+
+
+def build_hierarchical_namespace_migration_request(  # pylint: disable=name-too-long
+    resource_group_name: str, account_name: str, subscription_id: str, *, request_type: 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-01-01"))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/hnsonmigration",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+    _params["requestType"] = _SERIALIZER.query("request_type", request_type, "str")
+
+    # Construct headers
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="POST", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+def build_abort_hierarchical_namespace_migration_request(  # pylint: disable=name-too-long
+    resource_group_name: str, account_name: str, 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-01-01"))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/aborthnsonmigration",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="POST", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+def build_customer_initiated_migration_request(  # pylint: disable=name-too-long
+    resource_group_name: str, account_name: str, 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-01-01"))
+    content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/startAccountMigration",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    if content_type is not None:
+        _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str")
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="POST", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+def build_get_customer_initiated_migration_request(  # pylint: disable=name-too-long
+    resource_group_name: str,
+    account_name: str,
+    migration_name: Union[str, _models.MigrationName],
+    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-01-01"))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/accountMigrations/{migrationName}",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "migrationName": _SERIALIZER.url("migration_name", migration_name, "str"),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+def build_restore_blob_ranges_request(
+    resource_group_name: str, account_name: str, 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-01-01"))
+    content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/restoreBlobRanges",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    if content_type is not None:
+        _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str")
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="POST", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+def build_revoke_user_delegation_keys_request(  # pylint: disable=name-too-long
+    resource_group_name: str, account_name: str, subscription_id: str, **kwargs: Any
+) -> HttpRequest:
+    _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-01-01"))
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/revokeUserDelegationKeys",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url("account_name", account_name, "str", max_length=24, min_length=3),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    return HttpRequest(method="POST", url=_url, params=_params, **kwargs)
+
+
+class StorageAccountsOperations:  # pylint: disable=too-many-public-methods
+    """
+    .. warning::
+        **DO NOT** instantiate this class directly.
+
+        Instead, you should access the following operations through
+        :class:`~azure.mgmt.storage.v2024_01_01.StorageManagementClient`'s
+        :attr:`storage_accounts` attribute.
+    """
+
+    models = _models
+
+    def __init__(self, *args, **kwargs):
+        input_args = list(args)
+        self._client = input_args.pop(0) if input_args else kwargs.pop("client")
+        self._config = input_args.pop(0) if input_args else kwargs.pop("config")
+        self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer")
+        self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer")
+        self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version")
+
+    @overload
+    def check_name_availability(
+        self,
+        account_name: _models.StorageAccountCheckNameAvailabilityParameters,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.CheckNameAvailabilityResult:
+        """Checks that the storage account name is valid and is not already in use.
+
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name:
+         ~azure.mgmt.storage.v2024_01_01.models.StorageAccountCheckNameAvailabilityParameters
+        :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: CheckNameAvailabilityResult or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.CheckNameAvailabilityResult
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @overload
+    def check_name_availability(
+        self, account_name: IO[bytes], *, content_type: str = "application/json", **kwargs: Any
+    ) -> _models.CheckNameAvailabilityResult:
+        """Checks that the storage account name is valid and is not already in use.
+
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: IO[bytes]
+        :keyword content_type: Body Parameter content-type. Content type parameter for binary body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: CheckNameAvailabilityResult or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.CheckNameAvailabilityResult
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @distributed_trace
+    def check_name_availability(
+        self, account_name: Union[_models.StorageAccountCheckNameAvailabilityParameters, IO[bytes]], **kwargs: Any
+    ) -> _models.CheckNameAvailabilityResult:
+        """Checks that the storage account name is valid and is not already in use.
+
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Is either a StorageAccountCheckNameAvailabilityParameters type or a
+         IO[bytes] type. Required.
+        :type account_name:
+         ~azure.mgmt.storage.v2024_01_01.models.StorageAccountCheckNameAvailabilityParameters or
+         IO[bytes]
+        :return: CheckNameAvailabilityResult or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.CheckNameAvailabilityResult
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _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", self._api_version or "2024-01-01"))
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+        cls: ClsType[_models.CheckNameAvailabilityResult] = kwargs.pop("cls", None)
+
+        content_type = content_type or "application/json"
+        _json = None
+        _content = None
+        if isinstance(account_name, (IOBase, bytes)):
+            _content = account_name
+        else:
+            _json = self._serialize.body(account_name, "StorageAccountCheckNameAvailabilityParameters")
+
+        _request = build_check_name_availability_request(
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            content_type=content_type,
+            json=_json,
+            content=_content,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("CheckNameAvailabilityResult", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    def _create_initial(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        parameters: Union[_models.StorageAccountCreateParameters, IO[bytes]],
+        **kwargs: Any
+    ) -> Iterator[bytes]:
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _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", self._api_version or "2024-01-01"))
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
+
+        content_type = content_type or "application/json"
+        _json = None
+        _content = None
+        if isinstance(parameters, (IOBase, bytes)):
+            _content = parameters
+        else:
+            _json = self._serialize.body(parameters, "StorageAccountCreateParameters")
+
+        _request = build_create_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            content_type=content_type,
+            json=_json,
+            content=_content,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
+        pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200, 202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @overload
+    def begin_create(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        parameters: _models.StorageAccountCreateParameters,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> LROPoller[_models.StorageAccount]:
+        """Asynchronously creates a new storage account with the specified parameters. If an account is
+        already created and a subsequent create request is issued with different properties, the
+        account properties will be updated. If an account is already created and a subsequent create or
+        update request is issued with the exact same set of properties, the request will succeed.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param parameters: The parameters to provide for the created account. Required.
+        :type parameters: ~azure.mgmt.storage.v2024_01_01.models.StorageAccountCreateParameters
+        :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: An instance of LROPoller that returns either StorageAccount or the result of
+         cls(response)
+        :rtype: ~azure.core.polling.LROPoller[~azure.mgmt.storage.v2024_01_01.models.StorageAccount]
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @overload
+    def begin_create(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        parameters: IO[bytes],
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> LROPoller[_models.StorageAccount]:
+        """Asynchronously creates a new storage account with the specified parameters. If an account is
+        already created and a subsequent create request is issued with different properties, the
+        account properties will be updated. If an account is already created and a subsequent create or
+        update request is issued with the exact same set of properties, the request will succeed.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param parameters: The parameters to provide for the created account. Required.
+        :type parameters: IO[bytes]
+        :keyword content_type: Body Parameter content-type. Content type parameter for binary body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: An instance of LROPoller that returns either StorageAccount or the result of
+         cls(response)
+        :rtype: ~azure.core.polling.LROPoller[~azure.mgmt.storage.v2024_01_01.models.StorageAccount]
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @distributed_trace
+    def begin_create(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        parameters: Union[_models.StorageAccountCreateParameters, IO[bytes]],
+        **kwargs: Any
+    ) -> LROPoller[_models.StorageAccount]:
+        """Asynchronously creates a new storage account with the specified parameters. If an account is
+        already created and a subsequent create request is issued with different properties, the
+        account properties will be updated. If an account is already created and a subsequent create or
+        update request is issued with the exact same set of properties, the request will succeed.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param parameters: The parameters to provide for the created account. Is either a
+         StorageAccountCreateParameters type or a IO[bytes] type. Required.
+        :type parameters: ~azure.mgmt.storage.v2024_01_01.models.StorageAccountCreateParameters or
+         IO[bytes]
+        :return: An instance of LROPoller that returns either StorageAccount or the result of
+         cls(response)
+        :rtype: ~azure.core.polling.LROPoller[~azure.mgmt.storage.v2024_01_01.models.StorageAccount]
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        _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", self._api_version or "2024-01-01"))
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+        cls: ClsType[_models.StorageAccount] = kwargs.pop("cls", None)
+        polling: Union[bool, PollingMethod] = kwargs.pop("polling", True)
+        lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
+        cont_token: Optional[str] = kwargs.pop("continuation_token", None)
+        if cont_token is None:
+            raw_result = self._create_initial(
+                resource_group_name=resource_group_name,
+                account_name=account_name,
+                parameters=parameters,
+                api_version=api_version,
+                content_type=content_type,
+                cls=lambda x, y, z: x,
+                headers=_headers,
+                params=_params,
+                **kwargs
+            )
+            raw_result.http_response.read()  # type: ignore
+        kwargs.pop("error_map", None)
+
+        def get_long_running_output(pipeline_response):
+            deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
+            if cls:
+                return cls(pipeline_response, deserialized, {})  # type: ignore
+            return deserialized
+
+        if polling is True:
+            polling_method: PollingMethod = cast(PollingMethod, ARMPolling(lro_delay, **kwargs))
+        elif polling is False:
+            polling_method = cast(PollingMethod, NoPolling())
+        else:
+            polling_method = polling
+        if cont_token:
+            return LROPoller[_models.StorageAccount].from_continuation_token(
+                polling_method=polling_method,
+                continuation_token=cont_token,
+                client=self._client,
+                deserialization_callback=get_long_running_output,
+            )
+        return LROPoller[_models.StorageAccount](
+            self._client, raw_result, get_long_running_output, polling_method  # type: ignore
+        )
+
+    @distributed_trace
+    def delete(  # pylint: disable=inconsistent-return-statements
+        self, resource_group_name: str, account_name: str, **kwargs: Any
+    ) -> None:
+        """Deletes a storage account in Microsoft Azure.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :return: None or the result of cls(response)
+        :rtype: None
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[None] = kwargs.pop("cls", None)
+
+        _request = build_delete_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200, 204]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        if cls:
+            return cls(pipeline_response, None, {})  # type: ignore
+
+    @distributed_trace
+    def get_properties(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        expand: Optional[Union[str, _models.StorageAccountExpand]] = None,
+        **kwargs: Any
+    ) -> _models.StorageAccount:
+        """Returns the properties for the specified storage account including but not limited to name, SKU
+        name, location, and account status. The ListKeys operation should be used to retrieve storage
+        keys.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param expand: May be used to expand the properties within account's properties. By default,
+         data is not included when fetching properties. Currently we only support geoReplicationStats
+         and blobRestoreStatus. Known values are: "geoReplicationStats" and "blobRestoreStatus". Default
+         value is None.
+        :type expand: str or ~azure.mgmt.storage.v2024_01_01.models.StorageAccountExpand
+        :return: StorageAccount or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.StorageAccount
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.StorageAccount] = kwargs.pop("cls", None)
+
+        _request = build_get_properties_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            subscription_id=self._config.subscription_id,
+            expand=expand,
+            api_version=api_version,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @overload
+    def update(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        parameters: _models.StorageAccountUpdateParameters,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.StorageAccount:
+        """The update operation can be used to update the SKU, encryption, access tier, or tags for a
+        storage account. It can also be used to map the account to a custom domain. Only one custom
+        domain is supported per storage account; the replacement/change of custom domain is not
+        supported. In order to replace an old custom domain, the old value must be cleared/unregistered
+        before a new value can be set. The update of multiple properties is supported. This call does
+        not change the storage keys for the account. If you want to change the storage account keys,
+        use the regenerate keys operation. The location and name of the storage account cannot be
+        changed after creation.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param parameters: The parameters to provide for the updated account. Required.
+        :type parameters: ~azure.mgmt.storage.v2024_01_01.models.StorageAccountUpdateParameters
+        :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: StorageAccount or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.StorageAccount
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @overload
+    def update(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        parameters: IO[bytes],
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.StorageAccount:
+        """The update operation can be used to update the SKU, encryption, access tier, or tags for a
+        storage account. It can also be used to map the account to a custom domain. Only one custom
+        domain is supported per storage account; the replacement/change of custom domain is not
+        supported. In order to replace an old custom domain, the old value must be cleared/unregistered
+        before a new value can be set. The update of multiple properties is supported. This call does
+        not change the storage keys for the account. If you want to change the storage account keys,
+        use the regenerate keys operation. The location and name of the storage account cannot be
+        changed after creation.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param parameters: The parameters to provide for the updated account. Required.
+        :type parameters: IO[bytes]
+        :keyword content_type: Body Parameter content-type. Content type parameter for binary body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: StorageAccount or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.StorageAccount
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @distributed_trace
+    def update(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        parameters: Union[_models.StorageAccountUpdateParameters, IO[bytes]],
+        **kwargs: Any
+    ) -> _models.StorageAccount:
+        """The update operation can be used to update the SKU, encryption, access tier, or tags for a
+        storage account. It can also be used to map the account to a custom domain. Only one custom
+        domain is supported per storage account; the replacement/change of custom domain is not
+        supported. In order to replace an old custom domain, the old value must be cleared/unregistered
+        before a new value can be set. The update of multiple properties is supported. This call does
+        not change the storage keys for the account. If you want to change the storage account keys,
+        use the regenerate keys operation. The location and name of the storage account cannot be
+        changed after creation.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param parameters: The parameters to provide for the updated account. Is either a
+         StorageAccountUpdateParameters type or a IO[bytes] type. Required.
+        :type parameters: ~azure.mgmt.storage.v2024_01_01.models.StorageAccountUpdateParameters or
+         IO[bytes]
+        :return: StorageAccount or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.StorageAccount
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _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", self._api_version or "2024-01-01"))
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+        cls: ClsType[_models.StorageAccount] = kwargs.pop("cls", None)
+
+        content_type = content_type or "application/json"
+        _json = None
+        _content = None
+        if isinstance(parameters, (IOBase, bytes)):
+            _content = parameters
+        else:
+            _json = self._serialize.body(parameters, "StorageAccountUpdateParameters")
+
+        _request = build_update_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            content_type=content_type,
+            json=_json,
+            content=_content,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("StorageAccount", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @distributed_trace
+    def list(self, **kwargs: Any) -> Iterable["_models.StorageAccount"]:
+        """Lists all the storage accounts available under the subscription. Note that storage keys are not
+        returned; use the ListKeys operation for this.
+
+        :return: An iterator like instance of either StorageAccount or the result of cls(response)
+        :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.storage.v2024_01_01.models.StorageAccount]
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
+
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        def prepare_request(next_link=None):
+            if not next_link:
+
+                _request = build_list_request(
+                    subscription_id=self._config.subscription_id,
+                    api_version=api_version,
+                    headers=_headers,
+                    params=_params,
+                )
+                _request.url = self._client.format_url(_request.url)
+
+            else:
+                # make call to next link with the client's api-version
+                _parsed_next_link = urllib.parse.urlparse(next_link)
+                _next_request_params = case_insensitive_dict(
+                    {
+                        key: [urllib.parse.quote(v) for v in value]
+                        for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items()
+                    }
+                )
+                _next_request_params["api-version"] = self._api_version
+                _request = HttpRequest(
+                    "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
+                )
+                _request.url = self._client.format_url(_request.url)
+                _request.method = "GET"
+            return _request
+
+        def extract_data(pipeline_response):
+            deserialized = self._deserialize("StorageAccountListResult", pipeline_response)
+            list_of_elem = deserialized.value
+            if cls:
+                list_of_elem = cls(list_of_elem)  # type: ignore
+            return deserialized.next_link or None, iter(list_of_elem)
+
+        def get_next(next_link=None):
+            _request = prepare_request(next_link)
+
+            _stream = False
+            pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+                _request, stream=_stream, **kwargs
+            )
+            response = pipeline_response.http_response
+
+            if response.status_code not in [200]:
+                map_error(status_code=response.status_code, response=response, error_map=error_map)
+                raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+            return pipeline_response
+
+        return ItemPaged(get_next, extract_data)
+
+    @distributed_trace
+    def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> Iterable["_models.StorageAccount"]:
+        """Lists all the storage accounts available under the given resource group. Note that storage keys
+        are not returned; use the ListKeys operation for this.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :return: An iterator like instance of either StorageAccount or the result of cls(response)
+        :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.storage.v2024_01_01.models.StorageAccount]
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.StorageAccountListResult] = kwargs.pop("cls", None)
+
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        def prepare_request(next_link=None):
+            if not next_link:
+
+                _request = build_list_by_resource_group_request(
+                    resource_group_name=resource_group_name,
+                    subscription_id=self._config.subscription_id,
+                    api_version=api_version,
+                    headers=_headers,
+                    params=_params,
+                )
+                _request.url = self._client.format_url(_request.url)
+
+            else:
+                # make call to next link with the client's api-version
+                _parsed_next_link = urllib.parse.urlparse(next_link)
+                _next_request_params = case_insensitive_dict(
+                    {
+                        key: [urllib.parse.quote(v) for v in value]
+                        for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items()
+                    }
+                )
+                _next_request_params["api-version"] = self._api_version
+                _request = HttpRequest(
+                    "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
+                )
+                _request.url = self._client.format_url(_request.url)
+                _request.method = "GET"
+            return _request
+
+        def extract_data(pipeline_response):
+            deserialized = self._deserialize("StorageAccountListResult", pipeline_response)
+            list_of_elem = deserialized.value
+            if cls:
+                list_of_elem = cls(list_of_elem)  # type: ignore
+            return deserialized.next_link or None, iter(list_of_elem)
+
+        def get_next(next_link=None):
+            _request = prepare_request(next_link)
+
+            _stream = False
+            pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+                _request, stream=_stream, **kwargs
+            )
+            response = pipeline_response.http_response
+
+            if response.status_code not in [200]:
+                map_error(status_code=response.status_code, response=response, error_map=error_map)
+                raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+            return pipeline_response
+
+        return ItemPaged(get_next, extract_data)
+
+    @distributed_trace
+    def list_keys(
+        self, resource_group_name: str, account_name: str, expand: Literal["kerb"] = "kerb", **kwargs: Any
+    ) -> _models.StorageAccountListKeysResult:
+        """Lists the access keys or Kerberos keys (if active directory enabled) for the specified storage
+        account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param expand: Specifies type of the key to be listed. Possible value is kerb. Known values are
+         "kerb" and None. Default value is "kerb".
+        :type expand: str
+        :return: StorageAccountListKeysResult or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.StorageAccountListKeysResult
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.StorageAccountListKeysResult] = kwargs.pop("cls", None)
+
+        _request = build_list_keys_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            subscription_id=self._config.subscription_id,
+            expand=expand,
+            api_version=api_version,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @overload
+    def regenerate_key(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        regenerate_key: _models.StorageAccountRegenerateKeyParameters,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.StorageAccountListKeysResult:
+        """Regenerates one of the access keys or Kerberos keys for the specified storage account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param regenerate_key: Specifies name of the key which should be regenerated -- key1, key2,
+         kerb1, kerb2. Required.
+        :type regenerate_key:
+         ~azure.mgmt.storage.v2024_01_01.models.StorageAccountRegenerateKeyParameters
+        :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: StorageAccountListKeysResult or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.StorageAccountListKeysResult
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @overload
+    def regenerate_key(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        regenerate_key: IO[bytes],
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.StorageAccountListKeysResult:
+        """Regenerates one of the access keys or Kerberos keys for the specified storage account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param regenerate_key: Specifies name of the key which should be regenerated -- key1, key2,
+         kerb1, kerb2. Required.
+        :type regenerate_key: IO[bytes]
+        :keyword content_type: Body Parameter content-type. Content type parameter for binary body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: StorageAccountListKeysResult or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.StorageAccountListKeysResult
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @distributed_trace
+    def regenerate_key(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        regenerate_key: Union[_models.StorageAccountRegenerateKeyParameters, IO[bytes]],
+        **kwargs: Any
+    ) -> _models.StorageAccountListKeysResult:
+        """Regenerates one of the access keys or Kerberos keys for the specified storage account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param regenerate_key: Specifies name of the key which should be regenerated -- key1, key2,
+         kerb1, kerb2. Is either a StorageAccountRegenerateKeyParameters type or a IO[bytes] type.
+         Required.
+        :type regenerate_key:
+         ~azure.mgmt.storage.v2024_01_01.models.StorageAccountRegenerateKeyParameters or IO[bytes]
+        :return: StorageAccountListKeysResult or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.StorageAccountListKeysResult
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _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", self._api_version or "2024-01-01"))
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+        cls: ClsType[_models.StorageAccountListKeysResult] = kwargs.pop("cls", None)
+
+        content_type = content_type or "application/json"
+        _json = None
+        _content = None
+        if isinstance(regenerate_key, (IOBase, bytes)):
+            _content = regenerate_key
+        else:
+            _json = self._serialize.body(regenerate_key, "StorageAccountRegenerateKeyParameters")
+
+        _request = build_regenerate_key_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            content_type=content_type,
+            json=_json,
+            content=_content,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("StorageAccountListKeysResult", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @overload
+    def list_account_sas(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        parameters: _models.AccountSasParameters,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.ListAccountSasResponse:
+        """List SAS credentials of a storage account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param parameters: The parameters to provide to list SAS credentials for the storage account.
+         Required.
+        :type parameters: ~azure.mgmt.storage.v2024_01_01.models.AccountSasParameters
+        :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: ListAccountSasResponse or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.ListAccountSasResponse
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @overload
+    def list_account_sas(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        parameters: IO[bytes],
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.ListAccountSasResponse:
+        """List SAS credentials of a storage account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param parameters: The parameters to provide to list SAS credentials for the storage account.
+         Required.
+        :type parameters: IO[bytes]
+        :keyword content_type: Body Parameter content-type. Content type parameter for binary body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: ListAccountSasResponse or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.ListAccountSasResponse
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @distributed_trace
+    def list_account_sas(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        parameters: Union[_models.AccountSasParameters, IO[bytes]],
+        **kwargs: Any
+    ) -> _models.ListAccountSasResponse:
+        """List SAS credentials of a storage account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param parameters: The parameters to provide to list SAS credentials for the storage account.
+         Is either a AccountSasParameters type or a IO[bytes] type. Required.
+        :type parameters: ~azure.mgmt.storage.v2024_01_01.models.AccountSasParameters or IO[bytes]
+        :return: ListAccountSasResponse or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.ListAccountSasResponse
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _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", self._api_version or "2024-01-01"))
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+        cls: ClsType[_models.ListAccountSasResponse] = kwargs.pop("cls", None)
+
+        content_type = content_type or "application/json"
+        _json = None
+        _content = None
+        if isinstance(parameters, (IOBase, bytes)):
+            _content = parameters
+        else:
+            _json = self._serialize.body(parameters, "AccountSasParameters")
+
+        _request = build_list_account_sas_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            content_type=content_type,
+            json=_json,
+            content=_content,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("ListAccountSasResponse", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @overload
+    def list_service_sas(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        parameters: _models.ServiceSasParameters,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.ListServiceSasResponse:
+        """List service SAS credentials of a specific resource.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param parameters: The parameters to provide to list service SAS credentials. Required.
+        :type parameters: ~azure.mgmt.storage.v2024_01_01.models.ServiceSasParameters
+        :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: ListServiceSasResponse or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.ListServiceSasResponse
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @overload
+    def list_service_sas(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        parameters: IO[bytes],
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.ListServiceSasResponse:
+        """List service SAS credentials of a specific resource.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param parameters: The parameters to provide to list service SAS credentials. Required.
+        :type parameters: IO[bytes]
+        :keyword content_type: Body Parameter content-type. Content type parameter for binary body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: ListServiceSasResponse or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.ListServiceSasResponse
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @distributed_trace
+    def list_service_sas(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        parameters: Union[_models.ServiceSasParameters, IO[bytes]],
+        **kwargs: Any
+    ) -> _models.ListServiceSasResponse:
+        """List service SAS credentials of a specific resource.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param parameters: The parameters to provide to list service SAS credentials. Is either a
+         ServiceSasParameters type or a IO[bytes] type. Required.
+        :type parameters: ~azure.mgmt.storage.v2024_01_01.models.ServiceSasParameters or IO[bytes]
+        :return: ListServiceSasResponse or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.ListServiceSasResponse
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _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", self._api_version or "2024-01-01"))
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+        cls: ClsType[_models.ListServiceSasResponse] = kwargs.pop("cls", None)
+
+        content_type = content_type or "application/json"
+        _json = None
+        _content = None
+        if isinstance(parameters, (IOBase, bytes)):
+            _content = parameters
+        else:
+            _json = self._serialize.body(parameters, "ServiceSasParameters")
+
+        _request = build_list_service_sas_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            content_type=content_type,
+            json=_json,
+            content=_content,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("ListServiceSasResponse", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    def _failover_initial(
+        self, resource_group_name: str, account_name: str, failover_type: Literal["Planned"] = "Planned", **kwargs: Any
+    ) -> Iterator[bytes]:
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
+
+        _request = build_failover_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            subscription_id=self._config.subscription_id,
+            failover_type=failover_type,
+            api_version=api_version,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
+        pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200, 202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @distributed_trace
+    def begin_failover(
+        self, resource_group_name: str, account_name: str, failover_type: Literal["Planned"] = "Planned", **kwargs: Any
+    ) -> LROPoller[None]:
+        """A failover request can be triggered for a storage account in the event a primary endpoint
+        becomes unavailable for any reason. The failover occurs from the storage account's primary
+        cluster to the secondary cluster for RA-GRS accounts. The secondary cluster will become primary
+        after failover and the account is converted to LRS. In the case of a Planned Failover, the
+        primary and secondary clusters are swapped after failover and the account remains
+        geo-replicated. Failover should continue to be used in the event of availability issues as
+        Planned failover is only available while the primary and secondary endpoints are available. The
+        primary use case of a Planned Failover is disaster recovery testing drills. This type of
+        failover is invoked by setting FailoverType parameter to 'Planned'. Learn more about the
+        failover options here-
+        https://learn.microsoft.com/en-us/azure/storage/common/storage-disaster-recovery-guidance.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param failover_type: The parameter is set to 'Planned' to indicate whether a Planned failover
+         is requested. Known values are "Planned" and None. Default value is "Planned".
+        :type failover_type: str
+        :return: An instance of LROPoller that returns either None or the result of cls(response)
+        :rtype: ~azure.core.polling.LROPoller[None]
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[None] = kwargs.pop("cls", None)
+        polling: Union[bool, PollingMethod] = kwargs.pop("polling", True)
+        lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
+        cont_token: Optional[str] = kwargs.pop("continuation_token", None)
+        if cont_token is None:
+            raw_result = self._failover_initial(
+                resource_group_name=resource_group_name,
+                account_name=account_name,
+                failover_type=failover_type,
+                api_version=api_version,
+                cls=lambda x, y, z: x,
+                headers=_headers,
+                params=_params,
+                **kwargs
+            )
+            raw_result.http_response.read()  # type: ignore
+        kwargs.pop("error_map", None)
+
+        def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
+            if cls:
+                return cls(pipeline_response, None, {})  # type: ignore
+
+        if polling is True:
+            polling_method: PollingMethod = cast(
+                PollingMethod, ARMPolling(lro_delay, lro_options={"final-state-via": "location"}, **kwargs)
+            )
+        elif polling is False:
+            polling_method = cast(PollingMethod, NoPolling())
+        else:
+            polling_method = polling
+        if cont_token:
+            return LROPoller[None].from_continuation_token(
+                polling_method=polling_method,
+                continuation_token=cont_token,
+                client=self._client,
+                deserialization_callback=get_long_running_output,
+            )
+        return LROPoller[None](self._client, raw_result, get_long_running_output, polling_method)  # type: ignore
+
+    def _hierarchical_namespace_migration_initial(  # pylint: disable=name-too-long
+        self, resource_group_name: str, account_name: str, request_type: str, **kwargs: Any
+    ) -> Iterator[bytes]:
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
+
+        _request = build_hierarchical_namespace_migration_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            subscription_id=self._config.subscription_id,
+            request_type=request_type,
+            api_version=api_version,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
+        pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200, 202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
+            raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
+
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @distributed_trace
+    def begin_hierarchical_namespace_migration(
+        self, resource_group_name: str, account_name: str, request_type: str, **kwargs: Any
+    ) -> LROPoller[None]:
+        """Live Migration of storage account to enable Hns.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param request_type: Required. Hierarchical namespace migration type can either be a
+         hierarchical namespace validation request 'HnsOnValidationRequest' or a hydration request
+         'HnsOnHydrationRequest'. The validation request will validate the migration whereas the
+         hydration request will migrate the account. Required.
+        :type request_type: str
+        :return: An instance of LROPoller that returns either None or the result of cls(response)
+        :rtype: ~azure.core.polling.LROPoller[None]
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[None] = kwargs.pop("cls", None)
+        polling: Union[bool, PollingMethod] = kwargs.pop("polling", True)
+        lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
+        cont_token: Optional[str] = kwargs.pop("continuation_token", None)
+        if cont_token is None:
+            raw_result = self._hierarchical_namespace_migration_initial(
+                resource_group_name=resource_group_name,
+                account_name=account_name,
+                request_type=request_type,
+                api_version=api_version,
+                cls=lambda x, y, z: x,
+                headers=_headers,
+                params=_params,
+                **kwargs
+            )
+            raw_result.http_response.read()  # type: ignore
+        kwargs.pop("error_map", None)
+
+        def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
+            if cls:
+                return cls(pipeline_response, None, {})  # type: ignore
+
+        if polling is True:
+            polling_method: PollingMethod = cast(
+                PollingMethod, ARMPolling(lro_delay, lro_options={"final-state-via": "location"}, **kwargs)
+            )
+        elif polling is False:
+            polling_method = cast(PollingMethod, NoPolling())
+        else:
+            polling_method = polling
+        if cont_token:
+            return LROPoller[None].from_continuation_token(
+                polling_method=polling_method,
+                continuation_token=cont_token,
+                client=self._client,
+                deserialization_callback=get_long_running_output,
+            )
+        return LROPoller[None](self._client, raw_result, get_long_running_output, polling_method)  # type: ignore
+
+    def _abort_hierarchical_namespace_migration_initial(  # pylint: disable=name-too-long
+        self, resource_group_name: str, account_name: str, **kwargs: Any
+    ) -> Iterator[bytes]:
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
+
+        _request = build_abort_hierarchical_namespace_migration_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
+        pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200, 202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response)
+            raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
+
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @distributed_trace
+    def begin_abort_hierarchical_namespace_migration(  # pylint: disable=name-too-long
+        self, resource_group_name: str, account_name: str, **kwargs: Any
+    ) -> LROPoller[None]:
+        """Abort live Migration of storage account to enable Hns.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :return: An instance of LROPoller that returns either None or the result of cls(response)
+        :rtype: ~azure.core.polling.LROPoller[None]
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[None] = kwargs.pop("cls", None)
+        polling: Union[bool, PollingMethod] = kwargs.pop("polling", True)
+        lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
+        cont_token: Optional[str] = kwargs.pop("continuation_token", None)
+        if cont_token is None:
+            raw_result = self._abort_hierarchical_namespace_migration_initial(
+                resource_group_name=resource_group_name,
+                account_name=account_name,
+                api_version=api_version,
+                cls=lambda x, y, z: x,
+                headers=_headers,
+                params=_params,
+                **kwargs
+            )
+            raw_result.http_response.read()  # type: ignore
+        kwargs.pop("error_map", None)
+
+        def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
+            if cls:
+                return cls(pipeline_response, None, {})  # type: ignore
+
+        if polling is True:
+            polling_method: PollingMethod = cast(
+                PollingMethod, ARMPolling(lro_delay, lro_options={"final-state-via": "location"}, **kwargs)
+            )
+        elif polling is False:
+            polling_method = cast(PollingMethod, NoPolling())
+        else:
+            polling_method = polling
+        if cont_token:
+            return LROPoller[None].from_continuation_token(
+                polling_method=polling_method,
+                continuation_token=cont_token,
+                client=self._client,
+                deserialization_callback=get_long_running_output,
+            )
+        return LROPoller[None](self._client, raw_result, get_long_running_output, polling_method)  # type: ignore
+
+    def _customer_initiated_migration_initial(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        parameters: Union[_models.StorageAccountMigration, IO[bytes]],
+        **kwargs: Any
+    ) -> Iterator[bytes]:
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _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", self._api_version or "2024-01-01"))
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
+
+        content_type = content_type or "application/json"
+        _json = None
+        _content = None
+        if isinstance(parameters, (IOBase, bytes)):
+            _content = parameters
+        else:
+            _json = self._serialize.body(parameters, "StorageAccountMigration")
+
+        _request = build_customer_initiated_migration_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            content_type=content_type,
+            json=_json,
+            content=_content,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
+        pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200, 202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            error = self._deserialize.failsafe_deserialize(_models.ErrorResponseAutoGenerated, pipeline_response)
+            raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
+
+        response_headers = {}
+        if response.status_code == 202:
+            response_headers["Location"] = self._deserialize("str", response.headers.get("Location"))
+
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
+        if cls:
+            return cls(pipeline_response, deserialized, response_headers)  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @overload
+    def begin_customer_initiated_migration(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        parameters: _models.StorageAccountMigration,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> LROPoller[None]:
+        """Account Migration request can be triggered for a storage account to change its redundancy
+        level. The migration updates the non-zonal redundant storage account to a zonal redundant
+        account or vice-versa in order to have better reliability and availability. Zone-redundant
+        storage (ZRS) replicates your storage account synchronously across three Azure availability
+        zones in the primary region.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param parameters: The request parameters required to perform storage account migration.
+         Required.
+        :type parameters: ~azure.mgmt.storage.v2024_01_01.models.StorageAccountMigration
+        :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: An instance of LROPoller that returns either None or the result of cls(response)
+        :rtype: ~azure.core.polling.LROPoller[None]
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @overload
+    def begin_customer_initiated_migration(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        parameters: IO[bytes],
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> LROPoller[None]:
+        """Account Migration request can be triggered for a storage account to change its redundancy
+        level. The migration updates the non-zonal redundant storage account to a zonal redundant
+        account or vice-versa in order to have better reliability and availability. Zone-redundant
+        storage (ZRS) replicates your storage account synchronously across three Azure availability
+        zones in the primary region.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param parameters: The request parameters required to perform storage account migration.
+         Required.
+        :type parameters: IO[bytes]
+        :keyword content_type: Body Parameter content-type. Content type parameter for binary body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: An instance of LROPoller that returns either None or the result of cls(response)
+        :rtype: ~azure.core.polling.LROPoller[None]
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @distributed_trace
+    def begin_customer_initiated_migration(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        parameters: Union[_models.StorageAccountMigration, IO[bytes]],
+        **kwargs: Any
+    ) -> LROPoller[None]:
+        """Account Migration request can be triggered for a storage account to change its redundancy
+        level. The migration updates the non-zonal redundant storage account to a zonal redundant
+        account or vice-versa in order to have better reliability and availability. Zone-redundant
+        storage (ZRS) replicates your storage account synchronously across three Azure availability
+        zones in the primary region.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param parameters: The request parameters required to perform storage account migration. Is
+         either a StorageAccountMigration type or a IO[bytes] type. Required.
+        :type parameters: ~azure.mgmt.storage.v2024_01_01.models.StorageAccountMigration or IO[bytes]
+        :return: An instance of LROPoller that returns either None or the result of cls(response)
+        :rtype: ~azure.core.polling.LROPoller[None]
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        _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", self._api_version or "2024-01-01"))
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+        cls: ClsType[None] = kwargs.pop("cls", None)
+        polling: Union[bool, PollingMethod] = kwargs.pop("polling", True)
+        lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
+        cont_token: Optional[str] = kwargs.pop("continuation_token", None)
+        if cont_token is None:
+            raw_result = self._customer_initiated_migration_initial(
+                resource_group_name=resource_group_name,
+                account_name=account_name,
+                parameters=parameters,
+                api_version=api_version,
+                content_type=content_type,
+                cls=lambda x, y, z: x,
+                headers=_headers,
+                params=_params,
+                **kwargs
+            )
+            raw_result.http_response.read()  # type: ignore
+        kwargs.pop("error_map", None)
+
+        def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
+            if cls:
+                return cls(pipeline_response, None, {})  # type: ignore
+
+        if polling is True:
+            polling_method: PollingMethod = cast(
+                PollingMethod, ARMPolling(lro_delay, lro_options={"final-state-via": "location"}, **kwargs)
+            )
+        elif polling is False:
+            polling_method = cast(PollingMethod, NoPolling())
+        else:
+            polling_method = polling
+        if cont_token:
+            return LROPoller[None].from_continuation_token(
+                polling_method=polling_method,
+                continuation_token=cont_token,
+                client=self._client,
+                deserialization_callback=get_long_running_output,
+            )
+        return LROPoller[None](self._client, raw_result, get_long_running_output, polling_method)  # type: ignore
+
+    @distributed_trace
+    def get_customer_initiated_migration(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        migration_name: Union[str, _models.MigrationName],
+        **kwargs: Any
+    ) -> _models.StorageAccountMigration:
+        """Gets the status of the ongoing migration for the specified storage account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param migration_name: The name of the Storage Account Migration. It should always be
+         'default'. "default" Required.
+        :type migration_name: str or ~azure.mgmt.storage.v2024_01_01.models.MigrationName
+        :return: StorageAccountMigration or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.StorageAccountMigration
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.StorageAccountMigration] = kwargs.pop("cls", None)
+
+        _request = build_get_customer_initiated_migration_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            migration_name=migration_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            error = self._deserialize.failsafe_deserialize(_models.ErrorResponseAutoGenerated, pipeline_response)
+            raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("StorageAccountMigration", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    def _restore_blob_ranges_initial(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        parameters: Union[_models.BlobRestoreParameters, IO[bytes]],
+        **kwargs: Any
+    ) -> Iterator[bytes]:
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _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", self._api_version or "2024-01-01"))
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
+
+        content_type = content_type or "application/json"
+        _json = None
+        _content = None
+        if isinstance(parameters, (IOBase, bytes)):
+            _content = parameters
+        else:
+            _json = self._serialize.body(parameters, "BlobRestoreParameters")
+
+        _request = build_restore_blob_ranges_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            content_type=content_type,
+            json=_json,
+            content=_content,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
+        pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200, 202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @overload
+    def begin_restore_blob_ranges(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        parameters: _models.BlobRestoreParameters,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> LROPoller[_models.BlobRestoreStatus]:
+        """Restore blobs in the specified blob ranges.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param parameters: The parameters to provide for restore blob ranges. Required.
+        :type parameters: ~azure.mgmt.storage.v2024_01_01.models.BlobRestoreParameters
+        :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: An instance of LROPoller that returns either BlobRestoreStatus or the result of
+         cls(response)
+        :rtype: ~azure.core.polling.LROPoller[~azure.mgmt.storage.v2024_01_01.models.BlobRestoreStatus]
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @overload
+    def begin_restore_blob_ranges(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        parameters: IO[bytes],
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> LROPoller[_models.BlobRestoreStatus]:
+        """Restore blobs in the specified blob ranges.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param parameters: The parameters to provide for restore blob ranges. Required.
+        :type parameters: IO[bytes]
+        :keyword content_type: Body Parameter content-type. Content type parameter for binary body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: An instance of LROPoller that returns either BlobRestoreStatus or the result of
+         cls(response)
+        :rtype: ~azure.core.polling.LROPoller[~azure.mgmt.storage.v2024_01_01.models.BlobRestoreStatus]
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @distributed_trace
+    def begin_restore_blob_ranges(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        parameters: Union[_models.BlobRestoreParameters, IO[bytes]],
+        **kwargs: Any
+    ) -> LROPoller[_models.BlobRestoreStatus]:
+        """Restore blobs in the specified blob ranges.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param parameters: The parameters to provide for restore blob ranges. Is either a
+         BlobRestoreParameters type or a IO[bytes] type. Required.
+        :type parameters: ~azure.mgmt.storage.v2024_01_01.models.BlobRestoreParameters or IO[bytes]
+        :return: An instance of LROPoller that returns either BlobRestoreStatus or the result of
+         cls(response)
+        :rtype: ~azure.core.polling.LROPoller[~azure.mgmt.storage.v2024_01_01.models.BlobRestoreStatus]
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        _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", self._api_version or "2024-01-01"))
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+        cls: ClsType[_models.BlobRestoreStatus] = kwargs.pop("cls", None)
+        polling: Union[bool, PollingMethod] = kwargs.pop("polling", True)
+        lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
+        cont_token: Optional[str] = kwargs.pop("continuation_token", None)
+        if cont_token is None:
+            raw_result = self._restore_blob_ranges_initial(
+                resource_group_name=resource_group_name,
+                account_name=account_name,
+                parameters=parameters,
+                api_version=api_version,
+                content_type=content_type,
+                cls=lambda x, y, z: x,
+                headers=_headers,
+                params=_params,
+                **kwargs
+            )
+            raw_result.http_response.read()  # type: ignore
+        kwargs.pop("error_map", None)
+
+        def get_long_running_output(pipeline_response):
+            deserialized = self._deserialize("BlobRestoreStatus", pipeline_response.http_response)
+            if cls:
+                return cls(pipeline_response, deserialized, {})  # type: ignore
+            return deserialized
+
+        if polling is True:
+            polling_method: PollingMethod = cast(
+                PollingMethod, ARMPolling(lro_delay, lro_options={"final-state-via": "location"}, **kwargs)
+            )
+        elif polling is False:
+            polling_method = cast(PollingMethod, NoPolling())
+        else:
+            polling_method = polling
+        if cont_token:
+            return LROPoller[_models.BlobRestoreStatus].from_continuation_token(
+                polling_method=polling_method,
+                continuation_token=cont_token,
+                client=self._client,
+                deserialization_callback=get_long_running_output,
+            )
+        return LROPoller[_models.BlobRestoreStatus](
+            self._client, raw_result, get_long_running_output, polling_method  # type: ignore
+        )
+
+    @distributed_trace
+    def revoke_user_delegation_keys(  # pylint: disable=inconsistent-return-statements
+        self, resource_group_name: str, account_name: str, **kwargs: Any
+    ) -> None:
+        """Revoke user delegation keys.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :return: None or the result of cls(response)
+        :rtype: None
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[None] = kwargs.pop("cls", None)
+
+        _request = build_revoke_user_delegation_keys_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        if cls:
+            return cls(pipeline_response, None, {})  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/operations/_storage_task_assignment_instances_report_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/operations/_storage_task_assignment_instances_report_operations.py
new file mode 100644
index 000000000000..ea20ab88f98e
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/operations/_storage_task_assignment_instances_report_operations.py
@@ -0,0 +1,223 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+import sys
+from typing import Any, Callable, Dict, Iterable, Optional, TypeVar
+import urllib.parse
+
+from azure.core.exceptions import (
+    ClientAuthenticationError,
+    HttpResponseError,
+    ResourceExistsError,
+    ResourceNotFoundError,
+    ResourceNotModifiedError,
+    map_error,
+)
+from azure.core.paging import ItemPaged
+from azure.core.pipeline import PipelineResponse
+from azure.core.rest import HttpRequest, HttpResponse
+from azure.core.tracing.decorator import distributed_trace
+from azure.core.utils import case_insensitive_dict
+from azure.mgmt.core.exceptions import ARMErrorFormat
+
+from .. import models as _models
+from ..._serialization import Serializer
+
+if sys.version_info >= (3, 9):
+    from collections.abc import MutableMapping
+else:
+    from typing import MutableMapping  # type: ignore
+T = TypeVar("T")
+ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
+
+_SERIALIZER = Serializer()
+_SERIALIZER.client_side_validation = False
+
+
+def build_list_request(
+    resource_group_name: str,
+    account_name: str,
+    storage_task_assignment_name: str,
+    subscription_id: str,
+    *,
+    maxpagesize: Optional[int] = None,
+    filter: Optional[str] = None,
+    **kwargs: Any
+) -> HttpRequest:
+    _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
+    _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-01-01"))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/storageTaskAssignments/{storageTaskAssignmentName}/reports",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "storageTaskAssignmentName": _SERIALIZER.url(
+            "storage_task_assignment_name",
+            storage_task_assignment_name,
+            "str",
+            max_length=24,
+            min_length=3,
+            pattern=r"^[a-z0-9]{3,24}$",
+        ),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    if maxpagesize is not None:
+        _params["$maxpagesize"] = _SERIALIZER.query("maxpagesize", maxpagesize, "int")
+    if filter is not None:
+        _params["$filter"] = _SERIALIZER.query("filter", filter, "str")
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+class StorageTaskAssignmentInstancesReportOperations:  # pylint: disable=name-too-long
+    """
+    .. warning::
+        **DO NOT** instantiate this class directly.
+
+        Instead, you should access the following operations through
+        :class:`~azure.mgmt.storage.v2024_01_01.StorageManagementClient`'s
+        :attr:`storage_task_assignment_instances_report` attribute.
+    """
+
+    models = _models
+
+    def __init__(self, *args, **kwargs):
+        input_args = list(args)
+        self._client = input_args.pop(0) if input_args else kwargs.pop("client")
+        self._config = input_args.pop(0) if input_args else kwargs.pop("config")
+        self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer")
+        self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer")
+        self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version")
+
+    @distributed_trace
+    def list(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        storage_task_assignment_name: str,
+        maxpagesize: Optional[int] = None,
+        filter: Optional[str] = None,
+        **kwargs: Any
+    ) -> Iterable["_models.StorageTaskReportInstance"]:
+        # pylint: disable=line-too-long
+        """Fetch the report summary of a single storage task assignment's instances.
+
+        :param resource_group_name: The name of the resource group. The name is case insensitive.
+         Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param storage_task_assignment_name: The name of the storage task assignment within the
+         specified resource group. Storage task assignment names must be between 3 and 24 characters in
+         length and use numbers and lower-case letters only. Required.
+        :type storage_task_assignment_name: str
+        :param maxpagesize: Optional, specifies the maximum number of storage task assignment instances
+         to be included in the list response. Default value is None.
+        :type maxpagesize: int
+        :param filter: Optional. When specified, it can be used to query using reporting properties.
+         See `Constructing Filter Strings
+         <https://learn.microsoft.com/en-us/rest/api/storageservices/querying-tables-and-entities#constructing-filter-strings>`_
+         for details. Default value is None.
+        :type filter: str
+        :return: An iterator like instance of either StorageTaskReportInstance or the result of
+         cls(response)
+        :rtype:
+         ~azure.core.paging.ItemPaged[~azure.mgmt.storage.v2024_01_01.models.StorageTaskReportInstance]
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.StorageTaskReportSummary] = kwargs.pop("cls", None)
+
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        def prepare_request(next_link=None):
+            if not next_link:
+
+                _request = build_list_request(
+                    resource_group_name=resource_group_name,
+                    account_name=account_name,
+                    storage_task_assignment_name=storage_task_assignment_name,
+                    subscription_id=self._config.subscription_id,
+                    maxpagesize=maxpagesize,
+                    filter=filter,
+                    api_version=api_version,
+                    headers=_headers,
+                    params=_params,
+                )
+                _request.url = self._client.format_url(_request.url)
+
+            else:
+                # make call to next link with the client's api-version
+                _parsed_next_link = urllib.parse.urlparse(next_link)
+                _next_request_params = case_insensitive_dict(
+                    {
+                        key: [urllib.parse.quote(v) for v in value]
+                        for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items()
+                    }
+                )
+                _next_request_params["api-version"] = self._api_version
+                _request = HttpRequest(
+                    "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
+                )
+                _request.url = self._client.format_url(_request.url)
+                _request.method = "GET"
+            return _request
+
+        def extract_data(pipeline_response):
+            deserialized = self._deserialize("StorageTaskReportSummary", pipeline_response)
+            list_of_elem = deserialized.value
+            if cls:
+                list_of_elem = cls(list_of_elem)  # type: ignore
+            return deserialized.next_link or None, iter(list_of_elem)
+
+        def get_next(next_link=None):
+            _request = prepare_request(next_link)
+
+            _stream = False
+            pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+                _request, stream=_stream, **kwargs
+            )
+            response = pipeline_response.http_response
+
+            if response.status_code not in [200]:
+                map_error(status_code=response.status_code, response=response, error_map=error_map)
+                error = self._deserialize.failsafe_deserialize(_models.ErrorResponseAutoGenerated, pipeline_response)
+                raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
+
+            return pipeline_response
+
+        return ItemPaged(get_next, extract_data)
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/operations/_storage_task_assignments_instances_report_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/operations/_storage_task_assignments_instances_report_operations.py
new file mode 100644
index 000000000000..4b48c25b9a04
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/operations/_storage_task_assignments_instances_report_operations.py
@@ -0,0 +1,208 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+import sys
+from typing import Any, Callable, Dict, Iterable, Optional, TypeVar
+import urllib.parse
+
+from azure.core.exceptions import (
+    ClientAuthenticationError,
+    HttpResponseError,
+    ResourceExistsError,
+    ResourceNotFoundError,
+    ResourceNotModifiedError,
+    map_error,
+)
+from azure.core.paging import ItemPaged
+from azure.core.pipeline import PipelineResponse
+from azure.core.rest import HttpRequest, HttpResponse
+from azure.core.tracing.decorator import distributed_trace
+from azure.core.utils import case_insensitive_dict
+from azure.mgmt.core.exceptions import ARMErrorFormat
+
+from .. import models as _models
+from ..._serialization import Serializer
+
+if sys.version_info >= (3, 9):
+    from collections.abc import MutableMapping
+else:
+    from typing import MutableMapping  # type: ignore
+T = TypeVar("T")
+ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
+
+_SERIALIZER = Serializer()
+_SERIALIZER.client_side_validation = False
+
+
+def build_list_request(
+    resource_group_name: str,
+    account_name: str,
+    subscription_id: str,
+    *,
+    maxpagesize: Optional[int] = None,
+    filter: Optional[str] = None,
+    **kwargs: Any
+) -> HttpRequest:
+    _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
+    _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-01-01"))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/reports",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    if maxpagesize is not None:
+        _params["$maxpagesize"] = _SERIALIZER.query("maxpagesize", maxpagesize, "int")
+    if filter is not None:
+        _params["$filter"] = _SERIALIZER.query("filter", filter, "str")
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+class StorageTaskAssignmentsInstancesReportOperations:  # pylint: disable=name-too-long
+    """
+    .. warning::
+        **DO NOT** instantiate this class directly.
+
+        Instead, you should access the following operations through
+        :class:`~azure.mgmt.storage.v2024_01_01.StorageManagementClient`'s
+        :attr:`storage_task_assignments_instances_report` attribute.
+    """
+
+    models = _models
+
+    def __init__(self, *args, **kwargs):
+        input_args = list(args)
+        self._client = input_args.pop(0) if input_args else kwargs.pop("client")
+        self._config = input_args.pop(0) if input_args else kwargs.pop("config")
+        self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer")
+        self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer")
+        self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version")
+
+    @distributed_trace
+    def list(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        maxpagesize: Optional[int] = None,
+        filter: Optional[str] = None,
+        **kwargs: Any
+    ) -> Iterable["_models.StorageTaskReportInstance"]:
+        # pylint: disable=line-too-long
+        """Fetch the report summary of all the storage task assignments and instances in an account.
+
+        :param resource_group_name: The name of the resource group. The name is case insensitive.
+         Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param maxpagesize: Optional, specifies the maximum number of storage task assignment instances
+         to be included in the list response. Default value is None.
+        :type maxpagesize: int
+        :param filter: Optional. When specified, it can be used to query using reporting properties.
+         See `Constructing Filter Strings
+         <https://learn.microsoft.com/en-us/rest/api/storageservices/querying-tables-and-entities#constructing-filter-strings>`_
+         for details. Default value is None.
+        :type filter: str
+        :return: An iterator like instance of either StorageTaskReportInstance or the result of
+         cls(response)
+        :rtype:
+         ~azure.core.paging.ItemPaged[~azure.mgmt.storage.v2024_01_01.models.StorageTaskReportInstance]
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.StorageTaskReportSummary] = kwargs.pop("cls", None)
+
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        def prepare_request(next_link=None):
+            if not next_link:
+
+                _request = build_list_request(
+                    resource_group_name=resource_group_name,
+                    account_name=account_name,
+                    subscription_id=self._config.subscription_id,
+                    maxpagesize=maxpagesize,
+                    filter=filter,
+                    api_version=api_version,
+                    headers=_headers,
+                    params=_params,
+                )
+                _request.url = self._client.format_url(_request.url)
+
+            else:
+                # make call to next link with the client's api-version
+                _parsed_next_link = urllib.parse.urlparse(next_link)
+                _next_request_params = case_insensitive_dict(
+                    {
+                        key: [urllib.parse.quote(v) for v in value]
+                        for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items()
+                    }
+                )
+                _next_request_params["api-version"] = self._api_version
+                _request = HttpRequest(
+                    "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
+                )
+                _request.url = self._client.format_url(_request.url)
+                _request.method = "GET"
+            return _request
+
+        def extract_data(pipeline_response):
+            deserialized = self._deserialize("StorageTaskReportSummary", pipeline_response)
+            list_of_elem = deserialized.value
+            if cls:
+                list_of_elem = cls(list_of_elem)  # type: ignore
+            return deserialized.next_link or None, iter(list_of_elem)
+
+        def get_next(next_link=None):
+            _request = prepare_request(next_link)
+
+            _stream = False
+            pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+                _request, stream=_stream, **kwargs
+            )
+            response = pipeline_response.http_response
+
+            if response.status_code not in [200]:
+                map_error(status_code=response.status_code, response=response, error_map=error_map)
+                error = self._deserialize.failsafe_deserialize(_models.ErrorResponseAutoGenerated, pipeline_response)
+                raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
+
+            return pipeline_response
+
+        return ItemPaged(get_next, extract_data)
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/operations/_storage_task_assignments_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/operations/_storage_task_assignments_operations.py
new file mode 100644
index 000000000000..551ecc77d8a8
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/operations/_storage_task_assignments_operations.py
@@ -0,0 +1,1027 @@
+# 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.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+from io import IOBase
+import sys
+from typing import Any, Callable, Dict, IO, Iterable, Iterator, Optional, TypeVar, Union, cast, overload
+import urllib.parse
+
+from azure.core.exceptions import (
+    ClientAuthenticationError,
+    HttpResponseError,
+    ResourceExistsError,
+    ResourceNotFoundError,
+    ResourceNotModifiedError,
+    StreamClosedError,
+    StreamConsumedError,
+    map_error,
+)
+from azure.core.paging import ItemPaged
+from azure.core.pipeline import PipelineResponse
+from azure.core.polling import LROPoller, NoPolling, PollingMethod
+from azure.core.rest import HttpRequest, HttpResponse
+from azure.core.tracing.decorator import distributed_trace
+from azure.core.utils import case_insensitive_dict
+from azure.mgmt.core.exceptions import ARMErrorFormat
+from azure.mgmt.core.polling.arm_polling import ARMPolling
+
+from .. import models as _models
+from ..._serialization import Serializer
+
+if sys.version_info >= (3, 9):
+    from collections.abc import MutableMapping
+else:
+    from typing import MutableMapping  # type: ignore
+T = TypeVar("T")
+ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
+
+_SERIALIZER = Serializer()
+_SERIALIZER.client_side_validation = False
+
+
+def build_create_request(
+    resource_group_name: str, account_name: str, storage_task_assignment_name: str, 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-01-01"))
+    content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/storageTaskAssignments/{storageTaskAssignmentName}",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "storageTaskAssignmentName": _SERIALIZER.url(
+            "storage_task_assignment_name",
+            storage_task_assignment_name,
+            "str",
+            max_length=24,
+            min_length=3,
+            pattern=r"^[a-z0-9]{3,24}$",
+        ),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    if content_type is not None:
+        _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str")
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="PUT", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+def build_update_request(
+    resource_group_name: str, account_name: str, storage_task_assignment_name: str, 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-01-01"))
+    content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/storageTaskAssignments/{storageTaskAssignmentName}",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "storageTaskAssignmentName": _SERIALIZER.url(
+            "storage_task_assignment_name",
+            storage_task_assignment_name,
+            "str",
+            max_length=24,
+            min_length=3,
+            pattern=r"^[a-z0-9]{3,24}$",
+        ),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    if content_type is not None:
+        _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str")
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="PATCH", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+def build_get_request(
+    resource_group_name: str, account_name: str, storage_task_assignment_name: str, 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-01-01"))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/storageTaskAssignments/{storageTaskAssignmentName}",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "storageTaskAssignmentName": _SERIALIZER.url(
+            "storage_task_assignment_name",
+            storage_task_assignment_name,
+            "str",
+            max_length=24,
+            min_length=3,
+            pattern=r"^[a-z0-9]{3,24}$",
+        ),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+def build_delete_request(
+    resource_group_name: str, account_name: str, storage_task_assignment_name: str, 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-01-01"))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/storageTaskAssignments/{storageTaskAssignmentName}",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "storageTaskAssignmentName": _SERIALIZER.url(
+            "storage_task_assignment_name",
+            storage_task_assignment_name,
+            "str",
+            max_length=24,
+            min_length=3,
+            pattern=r"^[a-z0-9]{3,24}$",
+        ),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="DELETE", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+def build_list_request(
+    resource_group_name: str,
+    account_name: str,
+    subscription_id: str,
+    *,
+    maxpagesize: Optional[int] = None,
+    **kwargs: Any
+) -> HttpRequest:
+    _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
+    _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+    api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2024-01-01"))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/storageTaskAssignments",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    if maxpagesize is not None:
+        _params["$maxpagesize"] = _SERIALIZER.query("maxpagesize", maxpagesize, "int")
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+class StorageTaskAssignmentsOperations:
+    """
+    .. warning::
+        **DO NOT** instantiate this class directly.
+
+        Instead, you should access the following operations through
+        :class:`~azure.mgmt.storage.v2024_01_01.StorageManagementClient`'s
+        :attr:`storage_task_assignments` attribute.
+    """
+
+    models = _models
+
+    def __init__(self, *args, **kwargs):
+        input_args = list(args)
+        self._client = input_args.pop(0) if input_args else kwargs.pop("client")
+        self._config = input_args.pop(0) if input_args else kwargs.pop("config")
+        self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer")
+        self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer")
+        self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version")
+
+    def _create_initial(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        storage_task_assignment_name: str,
+        parameters: Union[_models.StorageTaskAssignment, IO[bytes]],
+        **kwargs: Any
+    ) -> Iterator[bytes]:
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _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", self._api_version or "2024-01-01"))
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
+
+        content_type = content_type or "application/json"
+        _json = None
+        _content = None
+        if isinstance(parameters, (IOBase, bytes)):
+            _content = parameters
+        else:
+            _json = self._serialize.body(parameters, "StorageTaskAssignment")
+
+        _request = build_create_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            storage_task_assignment_name=storage_task_assignment_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            content_type=content_type,
+            json=_json,
+            content=_content,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
+        pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200, 201, 202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            error = self._deserialize.failsafe_deserialize(_models.ErrorResponseAutoGenerated, pipeline_response)
+            raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
+
+        response_headers = {}
+        if response.status_code == 202:
+            response_headers["Location"] = self._deserialize("str", response.headers.get("Location"))
+
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
+        if cls:
+            return cls(pipeline_response, deserialized, response_headers)  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @overload
+    def begin_create(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        storage_task_assignment_name: str,
+        parameters: _models.StorageTaskAssignment,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> LROPoller[_models.StorageTaskAssignment]:
+        """Asynchronously creates a new storage task assignment sub-resource with the specified
+        parameters. If a storage task assignment is already created and a subsequent create request is
+        issued with different properties, the storage task assignment properties will be updated. If a
+        storage task assignment is already created and a subsequent create or update request is issued
+        with the exact same set of properties, the request will succeed.
+
+        :param resource_group_name: The name of the resource group. The name is case insensitive.
+         Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param storage_task_assignment_name: The name of the storage task assignment within the
+         specified resource group. Storage task assignment names must be between 3 and 24 characters in
+         length and use numbers and lower-case letters only. Required.
+        :type storage_task_assignment_name: str
+        :param parameters: The parameters to create a Storage Task Assignment. Required.
+        :type parameters: ~azure.mgmt.storage.v2024_01_01.models.StorageTaskAssignment
+        :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: An instance of LROPoller that returns either StorageTaskAssignment or the result of
+         cls(response)
+        :rtype:
+         ~azure.core.polling.LROPoller[~azure.mgmt.storage.v2024_01_01.models.StorageTaskAssignment]
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @overload
+    def begin_create(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        storage_task_assignment_name: str,
+        parameters: IO[bytes],
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> LROPoller[_models.StorageTaskAssignment]:
+        """Asynchronously creates a new storage task assignment sub-resource with the specified
+        parameters. If a storage task assignment is already created and a subsequent create request is
+        issued with different properties, the storage task assignment properties will be updated. If a
+        storage task assignment is already created and a subsequent create or update request is issued
+        with the exact same set of properties, the request will succeed.
+
+        :param resource_group_name: The name of the resource group. The name is case insensitive.
+         Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param storage_task_assignment_name: The name of the storage task assignment within the
+         specified resource group. Storage task assignment names must be between 3 and 24 characters in
+         length and use numbers and lower-case letters only. Required.
+        :type storage_task_assignment_name: str
+        :param parameters: The parameters to create a Storage Task Assignment. Required.
+        :type parameters: IO[bytes]
+        :keyword content_type: Body Parameter content-type. Content type parameter for binary body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: An instance of LROPoller that returns either StorageTaskAssignment or the result of
+         cls(response)
+        :rtype:
+         ~azure.core.polling.LROPoller[~azure.mgmt.storage.v2024_01_01.models.StorageTaskAssignment]
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @distributed_trace
+    def begin_create(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        storage_task_assignment_name: str,
+        parameters: Union[_models.StorageTaskAssignment, IO[bytes]],
+        **kwargs: Any
+    ) -> LROPoller[_models.StorageTaskAssignment]:
+        """Asynchronously creates a new storage task assignment sub-resource with the specified
+        parameters. If a storage task assignment is already created and a subsequent create request is
+        issued with different properties, the storage task assignment properties will be updated. If a
+        storage task assignment is already created and a subsequent create or update request is issued
+        with the exact same set of properties, the request will succeed.
+
+        :param resource_group_name: The name of the resource group. The name is case insensitive.
+         Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param storage_task_assignment_name: The name of the storage task assignment within the
+         specified resource group. Storage task assignment names must be between 3 and 24 characters in
+         length and use numbers and lower-case letters only. Required.
+        :type storage_task_assignment_name: str
+        :param parameters: The parameters to create a Storage Task Assignment. Is either a
+         StorageTaskAssignment type or a IO[bytes] type. Required.
+        :type parameters: ~azure.mgmt.storage.v2024_01_01.models.StorageTaskAssignment or IO[bytes]
+        :return: An instance of LROPoller that returns either StorageTaskAssignment or the result of
+         cls(response)
+        :rtype:
+         ~azure.core.polling.LROPoller[~azure.mgmt.storage.v2024_01_01.models.StorageTaskAssignment]
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        _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", self._api_version or "2024-01-01"))
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+        cls: ClsType[_models.StorageTaskAssignment] = kwargs.pop("cls", None)
+        polling: Union[bool, PollingMethod] = kwargs.pop("polling", True)
+        lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
+        cont_token: Optional[str] = kwargs.pop("continuation_token", None)
+        if cont_token is None:
+            raw_result = self._create_initial(
+                resource_group_name=resource_group_name,
+                account_name=account_name,
+                storage_task_assignment_name=storage_task_assignment_name,
+                parameters=parameters,
+                api_version=api_version,
+                content_type=content_type,
+                cls=lambda x, y, z: x,
+                headers=_headers,
+                params=_params,
+                **kwargs
+            )
+            raw_result.http_response.read()  # type: ignore
+        kwargs.pop("error_map", None)
+
+        def get_long_running_output(pipeline_response):
+            deserialized = self._deserialize("StorageTaskAssignment", pipeline_response.http_response)
+            if cls:
+                return cls(pipeline_response, deserialized, {})  # type: ignore
+            return deserialized
+
+        if polling is True:
+            polling_method: PollingMethod = cast(
+                PollingMethod, ARMPolling(lro_delay, lro_options={"final-state-via": "location"}, **kwargs)
+            )
+        elif polling is False:
+            polling_method = cast(PollingMethod, NoPolling())
+        else:
+            polling_method = polling
+        if cont_token:
+            return LROPoller[_models.StorageTaskAssignment].from_continuation_token(
+                polling_method=polling_method,
+                continuation_token=cont_token,
+                client=self._client,
+                deserialization_callback=get_long_running_output,
+            )
+        return LROPoller[_models.StorageTaskAssignment](
+            self._client, raw_result, get_long_running_output, polling_method  # type: ignore
+        )
+
+    def _update_initial(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        storage_task_assignment_name: str,
+        parameters: Union[_models.StorageTaskAssignmentUpdateParameters, IO[bytes]],
+        **kwargs: Any
+    ) -> Iterator[bytes]:
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _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", self._api_version or "2024-01-01"))
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
+
+        content_type = content_type or "application/json"
+        _json = None
+        _content = None
+        if isinstance(parameters, (IOBase, bytes)):
+            _content = parameters
+        else:
+            _json = self._serialize.body(parameters, "StorageTaskAssignmentUpdateParameters")
+
+        _request = build_update_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            storage_task_assignment_name=storage_task_assignment_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            content_type=content_type,
+            json=_json,
+            content=_content,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
+        pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200, 202]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            error = self._deserialize.failsafe_deserialize(_models.ErrorResponseAutoGenerated, pipeline_response)
+            raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
+
+        response_headers = {}
+        if response.status_code == 202:
+            response_headers["Location"] = self._deserialize("str", response.headers.get("Location"))
+
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
+        if cls:
+            return cls(pipeline_response, deserialized, response_headers)  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @overload
+    def begin_update(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        storage_task_assignment_name: str,
+        parameters: _models.StorageTaskAssignmentUpdateParameters,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> LROPoller[_models.StorageTaskAssignment]:
+        """Update storage task assignment properties.
+
+        :param resource_group_name: The name of the resource group. The name is case insensitive.
+         Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param storage_task_assignment_name: The name of the storage task assignment within the
+         specified resource group. Storage task assignment names must be between 3 and 24 characters in
+         length and use numbers and lower-case letters only. Required.
+        :type storage_task_assignment_name: str
+        :param parameters: The parameters to update a Storage Task Assignment. Required.
+        :type parameters: ~azure.mgmt.storage.v2024_01_01.models.StorageTaskAssignmentUpdateParameters
+        :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: An instance of LROPoller that returns either StorageTaskAssignment or the result of
+         cls(response)
+        :rtype:
+         ~azure.core.polling.LROPoller[~azure.mgmt.storage.v2024_01_01.models.StorageTaskAssignment]
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @overload
+    def begin_update(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        storage_task_assignment_name: str,
+        parameters: IO[bytes],
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> LROPoller[_models.StorageTaskAssignment]:
+        """Update storage task assignment properties.
+
+        :param resource_group_name: The name of the resource group. The name is case insensitive.
+         Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param storage_task_assignment_name: The name of the storage task assignment within the
+         specified resource group. Storage task assignment names must be between 3 and 24 characters in
+         length and use numbers and lower-case letters only. Required.
+        :type storage_task_assignment_name: str
+        :param parameters: The parameters to update a Storage Task Assignment. Required.
+        :type parameters: IO[bytes]
+        :keyword content_type: Body Parameter content-type. Content type parameter for binary body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: An instance of LROPoller that returns either StorageTaskAssignment or the result of
+         cls(response)
+        :rtype:
+         ~azure.core.polling.LROPoller[~azure.mgmt.storage.v2024_01_01.models.StorageTaskAssignment]
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @distributed_trace
+    def begin_update(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        storage_task_assignment_name: str,
+        parameters: Union[_models.StorageTaskAssignmentUpdateParameters, IO[bytes]],
+        **kwargs: Any
+    ) -> LROPoller[_models.StorageTaskAssignment]:
+        """Update storage task assignment properties.
+
+        :param resource_group_name: The name of the resource group. The name is case insensitive.
+         Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param storage_task_assignment_name: The name of the storage task assignment within the
+         specified resource group. Storage task assignment names must be between 3 and 24 characters in
+         length and use numbers and lower-case letters only. Required.
+        :type storage_task_assignment_name: str
+        :param parameters: The parameters to update a Storage Task Assignment. Is either a
+         StorageTaskAssignmentUpdateParameters type or a IO[bytes] type. Required.
+        :type parameters: ~azure.mgmt.storage.v2024_01_01.models.StorageTaskAssignmentUpdateParameters
+         or IO[bytes]
+        :return: An instance of LROPoller that returns either StorageTaskAssignment or the result of
+         cls(response)
+        :rtype:
+         ~azure.core.polling.LROPoller[~azure.mgmt.storage.v2024_01_01.models.StorageTaskAssignment]
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        _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", self._api_version or "2024-01-01"))
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+        cls: ClsType[_models.StorageTaskAssignment] = kwargs.pop("cls", None)
+        polling: Union[bool, PollingMethod] = kwargs.pop("polling", True)
+        lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
+        cont_token: Optional[str] = kwargs.pop("continuation_token", None)
+        if cont_token is None:
+            raw_result = self._update_initial(
+                resource_group_name=resource_group_name,
+                account_name=account_name,
+                storage_task_assignment_name=storage_task_assignment_name,
+                parameters=parameters,
+                api_version=api_version,
+                content_type=content_type,
+                cls=lambda x, y, z: x,
+                headers=_headers,
+                params=_params,
+                **kwargs
+            )
+            raw_result.http_response.read()  # type: ignore
+        kwargs.pop("error_map", None)
+
+        def get_long_running_output(pipeline_response):
+            deserialized = self._deserialize("StorageTaskAssignment", pipeline_response.http_response)
+            if cls:
+                return cls(pipeline_response, deserialized, {})  # type: ignore
+            return deserialized
+
+        if polling is True:
+            polling_method: PollingMethod = cast(
+                PollingMethod, ARMPolling(lro_delay, lro_options={"final-state-via": "location"}, **kwargs)
+            )
+        elif polling is False:
+            polling_method = cast(PollingMethod, NoPolling())
+        else:
+            polling_method = polling
+        if cont_token:
+            return LROPoller[_models.StorageTaskAssignment].from_continuation_token(
+                polling_method=polling_method,
+                continuation_token=cont_token,
+                client=self._client,
+                deserialization_callback=get_long_running_output,
+            )
+        return LROPoller[_models.StorageTaskAssignment](
+            self._client, raw_result, get_long_running_output, polling_method  # type: ignore
+        )
+
+    @distributed_trace
+    def get(
+        self, resource_group_name: str, account_name: str, storage_task_assignment_name: str, **kwargs: Any
+    ) -> _models.StorageTaskAssignment:
+        """Get the storage task assignment properties.
+
+        :param resource_group_name: The name of the resource group. The name is case insensitive.
+         Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param storage_task_assignment_name: The name of the storage task assignment within the
+         specified resource group. Storage task assignment names must be between 3 and 24 characters in
+         length and use numbers and lower-case letters only. Required.
+        :type storage_task_assignment_name: str
+        :return: StorageTaskAssignment or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.StorageTaskAssignment
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.StorageTaskAssignment] = kwargs.pop("cls", None)
+
+        _request = build_get_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            storage_task_assignment_name=storage_task_assignment_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            error = self._deserialize.failsafe_deserialize(_models.ErrorResponseAutoGenerated, pipeline_response)
+            raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("StorageTaskAssignment", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    def _delete_initial(
+        self, resource_group_name: str, account_name: str, storage_task_assignment_name: str, **kwargs: Any
+    ) -> Iterator[bytes]:
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[Iterator[bytes]] = kwargs.pop("cls", None)
+
+        _request = build_delete_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            storage_task_assignment_name=storage_task_assignment_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _decompress = kwargs.pop("decompress", True)
+        _stream = True
+        pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [202, 204]:
+            try:
+                response.read()  # Load the body in memory and close the socket
+            except (StreamConsumedError, StreamClosedError):
+                pass
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            error = self._deserialize.failsafe_deserialize(_models.ErrorResponseAutoGenerated, pipeline_response)
+            raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
+
+        response_headers = {}
+        if response.status_code == 202:
+            response_headers["Location"] = self._deserialize("str", response.headers.get("Location"))
+
+        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+
+        if cls:
+            return cls(pipeline_response, deserialized, response_headers)  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @distributed_trace
+    def begin_delete(
+        self, resource_group_name: str, account_name: str, storage_task_assignment_name: str, **kwargs: Any
+    ) -> LROPoller[None]:
+        """Delete the storage task assignment sub-resource.
+
+        :param resource_group_name: The name of the resource group. The name is case insensitive.
+         Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param storage_task_assignment_name: The name of the storage task assignment within the
+         specified resource group. Storage task assignment names must be between 3 and 24 characters in
+         length and use numbers and lower-case letters only. Required.
+        :type storage_task_assignment_name: str
+        :return: An instance of LROPoller that returns either None or the result of cls(response)
+        :rtype: ~azure.core.polling.LROPoller[None]
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[None] = kwargs.pop("cls", None)
+        polling: Union[bool, PollingMethod] = kwargs.pop("polling", True)
+        lro_delay = kwargs.pop("polling_interval", self._config.polling_interval)
+        cont_token: Optional[str] = kwargs.pop("continuation_token", None)
+        if cont_token is None:
+            raw_result = self._delete_initial(
+                resource_group_name=resource_group_name,
+                account_name=account_name,
+                storage_task_assignment_name=storage_task_assignment_name,
+                api_version=api_version,
+                cls=lambda x, y, z: x,
+                headers=_headers,
+                params=_params,
+                **kwargs
+            )
+            raw_result.http_response.read()  # type: ignore
+        kwargs.pop("error_map", None)
+
+        def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-return-statements
+            if cls:
+                return cls(pipeline_response, None, {})  # type: ignore
+
+        if polling is True:
+            polling_method: PollingMethod = cast(
+                PollingMethod, ARMPolling(lro_delay, lro_options={"final-state-via": "location"}, **kwargs)
+            )
+        elif polling is False:
+            polling_method = cast(PollingMethod, NoPolling())
+        else:
+            polling_method = polling
+        if cont_token:
+            return LROPoller[None].from_continuation_token(
+                polling_method=polling_method,
+                continuation_token=cont_token,
+                client=self._client,
+                deserialization_callback=get_long_running_output,
+            )
+        return LROPoller[None](self._client, raw_result, get_long_running_output, polling_method)  # type: ignore
+
+    @distributed_trace
+    def list(
+        self, resource_group_name: str, account_name: str, maxpagesize: Optional[int] = None, **kwargs: Any
+    ) -> Iterable["_models.StorageTaskAssignment"]:
+        """List all the storage task assignments in an account.
+
+        :param resource_group_name: The name of the resource group. The name is case insensitive.
+         Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param maxpagesize: Optional, specifies the maximum number of storage task assignment Ids to be
+         included in the list response. Default value is None.
+        :type maxpagesize: int
+        :return: An iterator like instance of either StorageTaskAssignment or the result of
+         cls(response)
+        :rtype:
+         ~azure.core.paging.ItemPaged[~azure.mgmt.storage.v2024_01_01.models.StorageTaskAssignment]
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.StorageTaskAssignmentsList] = kwargs.pop("cls", None)
+
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        def prepare_request(next_link=None):
+            if not next_link:
+
+                _request = build_list_request(
+                    resource_group_name=resource_group_name,
+                    account_name=account_name,
+                    subscription_id=self._config.subscription_id,
+                    maxpagesize=maxpagesize,
+                    api_version=api_version,
+                    headers=_headers,
+                    params=_params,
+                )
+                _request.url = self._client.format_url(_request.url)
+
+            else:
+                # make call to next link with the client's api-version
+                _parsed_next_link = urllib.parse.urlparse(next_link)
+                _next_request_params = case_insensitive_dict(
+                    {
+                        key: [urllib.parse.quote(v) for v in value]
+                        for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items()
+                    }
+                )
+                _next_request_params["api-version"] = self._api_version
+                _request = HttpRequest(
+                    "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
+                )
+                _request.url = self._client.format_url(_request.url)
+                _request.method = "GET"
+            return _request
+
+        def extract_data(pipeline_response):
+            deserialized = self._deserialize("StorageTaskAssignmentsList", pipeline_response)
+            list_of_elem = deserialized.value
+            if cls:
+                list_of_elem = cls(list_of_elem)  # type: ignore
+            return deserialized.next_link or None, iter(list_of_elem)
+
+        def get_next(next_link=None):
+            _request = prepare_request(next_link)
+
+            _stream = False
+            pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+                _request, stream=_stream, **kwargs
+            )
+            response = pipeline_response.http_response
+
+            if response.status_code not in [200]:
+                map_error(status_code=response.status_code, response=response, error_map=error_map)
+                error = self._deserialize.failsafe_deserialize(_models.ErrorResponseAutoGenerated, pipeline_response)
+                raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
+
+            return pipeline_response
+
+        return ItemPaged(get_next, extract_data)
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/operations/_table_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/operations/_table_operations.py
new file mode 100644
index 000000000000..69619dc68215
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/operations/_table_operations.py
@@ -0,0 +1,766 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+from io import IOBase
+import sys
+from typing import Any, Callable, Dict, IO, Iterable, Optional, TypeVar, Union, overload
+import urllib.parse
+
+from azure.core.exceptions import (
+    ClientAuthenticationError,
+    HttpResponseError,
+    ResourceExistsError,
+    ResourceNotFoundError,
+    ResourceNotModifiedError,
+    map_error,
+)
+from azure.core.paging import ItemPaged
+from azure.core.pipeline import PipelineResponse
+from azure.core.rest import HttpRequest, HttpResponse
+from azure.core.tracing.decorator import distributed_trace
+from azure.core.utils import case_insensitive_dict
+from azure.mgmt.core.exceptions import ARMErrorFormat
+
+from .. import models as _models
+from ..._serialization import Serializer
+
+if sys.version_info >= (3, 9):
+    from collections.abc import MutableMapping
+else:
+    from typing import MutableMapping  # type: ignore
+T = TypeVar("T")
+ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
+
+_SERIALIZER = Serializer()
+_SERIALIZER.client_side_validation = False
+
+
+def build_create_request(
+    resource_group_name: str, account_name: str, table_name: str, 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-01-01"))
+    content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/tableServices/default/tables/{tableName}",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+        "tableName": _SERIALIZER.url(
+            "table_name", table_name, "str", max_length=63, min_length=3, pattern=r"^[A-Za-z][A-Za-z0-9]{2,62}$"
+        ),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    if content_type is not None:
+        _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str")
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="PUT", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+def build_update_request(
+    resource_group_name: str, account_name: str, table_name: str, 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-01-01"))
+    content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/tableServices/default/tables/{tableName}",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+        "tableName": _SERIALIZER.url(
+            "table_name", table_name, "str", max_length=63, min_length=3, pattern=r"^[A-Za-z][A-Za-z0-9]{2,62}$"
+        ),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    if content_type is not None:
+        _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str")
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="PATCH", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+def build_get_request(
+    resource_group_name: str, account_name: str, table_name: str, 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-01-01"))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/tableServices/default/tables/{tableName}",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+        "tableName": _SERIALIZER.url(
+            "table_name", table_name, "str", max_length=63, min_length=3, pattern=r"^[A-Za-z][A-Za-z0-9]{2,62}$"
+        ),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+def build_delete_request(
+    resource_group_name: str, account_name: str, table_name: str, 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-01-01"))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/tableServices/default/tables/{tableName}",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+        "tableName": _SERIALIZER.url(
+            "table_name", table_name, "str", max_length=63, min_length=3, pattern=r"^[A-Za-z][A-Za-z0-9]{2,62}$"
+        ),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="DELETE", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+def build_list_request(resource_group_name: str, account_name: str, 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-01-01"))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/tableServices/default/tables",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+class TableOperations:
+    """
+    .. warning::
+        **DO NOT** instantiate this class directly.
+
+        Instead, you should access the following operations through
+        :class:`~azure.mgmt.storage.v2024_01_01.StorageManagementClient`'s
+        :attr:`table` attribute.
+    """
+
+    models = _models
+
+    def __init__(self, *args, **kwargs):
+        input_args = list(args)
+        self._client = input_args.pop(0) if input_args else kwargs.pop("client")
+        self._config = input_args.pop(0) if input_args else kwargs.pop("config")
+        self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer")
+        self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer")
+        self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version")
+
+    @overload
+    def create(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        table_name: str,
+        parameters: Optional[_models.Table] = None,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.Table:
+        """Creates a new table with the specified table name, under the specified account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param table_name: A table name must be unique within a storage account and must be between 3
+         and 63 characters.The name must comprise of only alphanumeric characters and it cannot begin
+         with a numeric character. Required.
+        :type table_name: str
+        :param parameters: The parameters to provide to create a table. Default value is None.
+        :type parameters: ~azure.mgmt.storage.v2024_01_01.models.Table
+        :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: Table or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.Table
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @overload
+    def create(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        table_name: str,
+        parameters: Optional[IO[bytes]] = None,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.Table:
+        """Creates a new table with the specified table name, under the specified account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param table_name: A table name must be unique within a storage account and must be between 3
+         and 63 characters.The name must comprise of only alphanumeric characters and it cannot begin
+         with a numeric character. Required.
+        :type table_name: str
+        :param parameters: The parameters to provide to create a table. Default value is None.
+        :type parameters: IO[bytes]
+        :keyword content_type: Body Parameter content-type. Content type parameter for binary body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: Table or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.Table
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @distributed_trace
+    def create(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        table_name: str,
+        parameters: Optional[Union[_models.Table, IO[bytes]]] = None,
+        **kwargs: Any
+    ) -> _models.Table:
+        """Creates a new table with the specified table name, under the specified account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param table_name: A table name must be unique within a storage account and must be between 3
+         and 63 characters.The name must comprise of only alphanumeric characters and it cannot begin
+         with a numeric character. Required.
+        :type table_name: str
+        :param parameters: The parameters to provide to create a table. Is either a Table type or a
+         IO[bytes] type. Default value is None.
+        :type parameters: ~azure.mgmt.storage.v2024_01_01.models.Table or IO[bytes]
+        :return: Table or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.Table
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _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", self._api_version or "2024-01-01"))
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+        cls: ClsType[_models.Table] = kwargs.pop("cls", None)
+
+        content_type = content_type or "application/json"
+        _json = None
+        _content = None
+        if isinstance(parameters, (IOBase, bytes)):
+            _content = parameters
+        else:
+            if parameters is not None:
+                _json = self._serialize.body(parameters, "Table")
+            else:
+                _json = None
+
+        _request = build_create_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            table_name=table_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            content_type=content_type,
+            json=_json,
+            content=_content,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("Table", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @overload
+    def update(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        table_name: str,
+        parameters: Optional[_models.Table] = None,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.Table:
+        """Creates a new table with the specified table name, under the specified account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param table_name: A table name must be unique within a storage account and must be between 3
+         and 63 characters.The name must comprise of only alphanumeric characters and it cannot begin
+         with a numeric character. Required.
+        :type table_name: str
+        :param parameters: The parameters to provide to create a table. Default value is None.
+        :type parameters: ~azure.mgmt.storage.v2024_01_01.models.Table
+        :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: Table or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.Table
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @overload
+    def update(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        table_name: str,
+        parameters: Optional[IO[bytes]] = None,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.Table:
+        """Creates a new table with the specified table name, under the specified account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param table_name: A table name must be unique within a storage account and must be between 3
+         and 63 characters.The name must comprise of only alphanumeric characters and it cannot begin
+         with a numeric character. Required.
+        :type table_name: str
+        :param parameters: The parameters to provide to create a table. Default value is None.
+        :type parameters: IO[bytes]
+        :keyword content_type: Body Parameter content-type. Content type parameter for binary body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: Table or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.Table
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @distributed_trace
+    def update(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        table_name: str,
+        parameters: Optional[Union[_models.Table, IO[bytes]]] = None,
+        **kwargs: Any
+    ) -> _models.Table:
+        """Creates a new table with the specified table name, under the specified account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param table_name: A table name must be unique within a storage account and must be between 3
+         and 63 characters.The name must comprise of only alphanumeric characters and it cannot begin
+         with a numeric character. Required.
+        :type table_name: str
+        :param parameters: The parameters to provide to create a table. Is either a Table type or a
+         IO[bytes] type. Default value is None.
+        :type parameters: ~azure.mgmt.storage.v2024_01_01.models.Table or IO[bytes]
+        :return: Table or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.Table
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _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", self._api_version or "2024-01-01"))
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+        cls: ClsType[_models.Table] = kwargs.pop("cls", None)
+
+        content_type = content_type or "application/json"
+        _json = None
+        _content = None
+        if isinstance(parameters, (IOBase, bytes)):
+            _content = parameters
+        else:
+            if parameters is not None:
+                _json = self._serialize.body(parameters, "Table")
+            else:
+                _json = None
+
+        _request = build_update_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            table_name=table_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            content_type=content_type,
+            json=_json,
+            content=_content,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("Table", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @distributed_trace
+    def get(self, resource_group_name: str, account_name: str, table_name: str, **kwargs: Any) -> _models.Table:
+        """Gets the table with the specified table name, under the specified account if it exists.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param table_name: A table name must be unique within a storage account and must be between 3
+         and 63 characters.The name must comprise of only alphanumeric characters and it cannot begin
+         with a numeric character. Required.
+        :type table_name: str
+        :return: Table or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.Table
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.Table] = kwargs.pop("cls", None)
+
+        _request = build_get_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            table_name=table_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("Table", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @distributed_trace
+    def delete(  # pylint: disable=inconsistent-return-statements
+        self, resource_group_name: str, account_name: str, table_name: str, **kwargs: Any
+    ) -> None:
+        """Deletes the table with the specified table name, under the specified account if it exists.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param table_name: A table name must be unique within a storage account and must be between 3
+         and 63 characters.The name must comprise of only alphanumeric characters and it cannot begin
+         with a numeric character. Required.
+        :type table_name: str
+        :return: None or the result of cls(response)
+        :rtype: None
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[None] = kwargs.pop("cls", None)
+
+        _request = build_delete_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            table_name=table_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [204]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        if cls:
+            return cls(pipeline_response, None, {})  # type: ignore
+
+    @distributed_trace
+    def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> Iterable["_models.Table"]:
+        """Gets a list of all the tables under the specified storage account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :return: An iterator like instance of either Table or the result of cls(response)
+        :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.storage.v2024_01_01.models.Table]
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.ListTableResource] = kwargs.pop("cls", None)
+
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        def prepare_request(next_link=None):
+            if not next_link:
+
+                _request = build_list_request(
+                    resource_group_name=resource_group_name,
+                    account_name=account_name,
+                    subscription_id=self._config.subscription_id,
+                    api_version=api_version,
+                    headers=_headers,
+                    params=_params,
+                )
+                _request.url = self._client.format_url(_request.url)
+
+            else:
+                # make call to next link with the client's api-version
+                _parsed_next_link = urllib.parse.urlparse(next_link)
+                _next_request_params = case_insensitive_dict(
+                    {
+                        key: [urllib.parse.quote(v) for v in value]
+                        for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items()
+                    }
+                )
+                _next_request_params["api-version"] = self._api_version
+                _request = HttpRequest(
+                    "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
+                )
+                _request.url = self._client.format_url(_request.url)
+                _request.method = "GET"
+            return _request
+
+        def extract_data(pipeline_response):
+            deserialized = self._deserialize("ListTableResource", pipeline_response)
+            list_of_elem = deserialized.value
+            if cls:
+                list_of_elem = cls(list_of_elem)  # type: ignore
+            return deserialized.next_link or None, iter(list_of_elem)
+
+        def get_next(next_link=None):
+            _request = prepare_request(next_link)
+
+            _stream = False
+            pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+                _request, stream=_stream, **kwargs
+            )
+            response = pipeline_response.http_response
+
+            if response.status_code not in [200]:
+                map_error(status_code=response.status_code, response=response, error_map=error_map)
+                raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+            return pipeline_response
+
+        return ItemPaged(get_next, extract_data)
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/operations/_table_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/operations/_table_services_operations.py
new file mode 100644
index 000000000000..5024fc68a203
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/operations/_table_services_operations.py
@@ -0,0 +1,431 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+from io import IOBase
+import sys
+from typing import Any, Callable, Dict, IO, Literal, Optional, TypeVar, Union, overload
+
+from azure.core.exceptions import (
+    ClientAuthenticationError,
+    HttpResponseError,
+    ResourceExistsError,
+    ResourceNotFoundError,
+    ResourceNotModifiedError,
+    map_error,
+)
+from azure.core.pipeline import PipelineResponse
+from azure.core.rest import HttpRequest, HttpResponse
+from azure.core.tracing.decorator import distributed_trace
+from azure.core.utils import case_insensitive_dict
+from azure.mgmt.core.exceptions import ARMErrorFormat
+
+from .. import models as _models
+from ..._serialization import Serializer
+
+if sys.version_info >= (3, 9):
+    from collections.abc import MutableMapping
+else:
+    from typing import MutableMapping  # type: ignore
+T = TypeVar("T")
+ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
+
+_SERIALIZER = Serializer()
+_SERIALIZER.client_side_validation = False
+
+
+def build_list_request(resource_group_name: str, account_name: str, 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-01-01"))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/tableServices",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+def build_set_service_properties_request(
+    resource_group_name: str, account_name: str, 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-01-01"))
+    table_service_name: Literal["default"] = kwargs.pop("table_service_name", "default")
+    content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/tableServices/{tableServiceName}",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+        "tableServiceName": _SERIALIZER.url("table_service_name", table_service_name, "str"),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    if content_type is not None:
+        _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str")
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="PUT", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+def build_get_service_properties_request(
+    resource_group_name: str, account_name: str, 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-01-01"))
+    table_service_name: Literal["default"] = kwargs.pop("table_service_name", "default")
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url",
+        "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/tableServices/{tableServiceName}",
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "resourceGroupName": _SERIALIZER.url(
+            "resource_group_name", resource_group_name, "str", max_length=90, min_length=1, pattern=r"^[-\w\._\(\)]+$"
+        ),
+        "accountName": _SERIALIZER.url(
+            "account_name", account_name, "str", max_length=24, min_length=3, pattern=r"^[a-z0-9]+$"
+        ),
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+        "tableServiceName": _SERIALIZER.url("table_service_name", table_service_name, "str"),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+class TableServicesOperations:
+    """
+    .. warning::
+        **DO NOT** instantiate this class directly.
+
+        Instead, you should access the following operations through
+        :class:`~azure.mgmt.storage.v2024_01_01.StorageManagementClient`'s
+        :attr:`table_services` attribute.
+    """
+
+    models = _models
+
+    def __init__(self, *args, **kwargs):
+        input_args = list(args)
+        self._client = input_args.pop(0) if input_args else kwargs.pop("client")
+        self._config = input_args.pop(0) if input_args else kwargs.pop("config")
+        self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer")
+        self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer")
+        self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version")
+
+    @distributed_trace
+    def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> _models.ListTableServices:
+        """List all table services for the storage account.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :return: ListTableServices or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.ListTableServices
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.ListTableServices] = kwargs.pop("cls", None)
+
+        _request = build_list_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("ListTableServices", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @overload
+    def set_service_properties(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        parameters: _models.TableServiceProperties,
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.TableServiceProperties:
+        """Sets the properties of a storage account’s Table service, including properties for Storage
+        Analytics and CORS (Cross-Origin Resource Sharing) rules.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param parameters: The properties of a storage account’s Table service, only properties for
+         Storage Analytics and CORS (Cross-Origin Resource Sharing) rules can be specified. Required.
+        :type parameters: ~azure.mgmt.storage.v2024_01_01.models.TableServiceProperties
+        :keyword content_type: Body Parameter content-type. Content type parameter for JSON body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: TableServiceProperties or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.TableServiceProperties
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @overload
+    def set_service_properties(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        parameters: IO[bytes],
+        *,
+        content_type: str = "application/json",
+        **kwargs: Any
+    ) -> _models.TableServiceProperties:
+        """Sets the properties of a storage account’s Table service, including properties for Storage
+        Analytics and CORS (Cross-Origin Resource Sharing) rules.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param parameters: The properties of a storage account’s Table service, only properties for
+         Storage Analytics and CORS (Cross-Origin Resource Sharing) rules can be specified. Required.
+        :type parameters: IO[bytes]
+        :keyword content_type: Body Parameter content-type. Content type parameter for binary body.
+         Default value is "application/json".
+        :paramtype content_type: str
+        :return: TableServiceProperties or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.TableServiceProperties
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+
+    @distributed_trace
+    def set_service_properties(
+        self,
+        resource_group_name: str,
+        account_name: str,
+        parameters: Union[_models.TableServiceProperties, IO[bytes]],
+        **kwargs: Any
+    ) -> _models.TableServiceProperties:
+        """Sets the properties of a storage account’s Table service, including properties for Storage
+        Analytics and CORS (Cross-Origin Resource Sharing) rules.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :param parameters: The properties of a storage account’s Table service, only properties for
+         Storage Analytics and CORS (Cross-Origin Resource Sharing) rules can be specified. Is either a
+         TableServiceProperties type or a IO[bytes] type. Required.
+        :type parameters: ~azure.mgmt.storage.v2024_01_01.models.TableServiceProperties or IO[bytes]
+        :return: TableServiceProperties or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.TableServiceProperties
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _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", self._api_version or "2024-01-01"))
+        table_service_name: Literal["default"] = kwargs.pop("table_service_name", "default")
+        content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
+        cls: ClsType[_models.TableServiceProperties] = kwargs.pop("cls", None)
+
+        content_type = content_type or "application/json"
+        _json = None
+        _content = None
+        if isinstance(parameters, (IOBase, bytes)):
+            _content = parameters
+        else:
+            _json = self._serialize.body(parameters, "TableServiceProperties")
+
+        _request = build_set_service_properties_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            table_service_name=table_service_name,
+            content_type=content_type,
+            json=_json,
+            content=_content,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("TableServiceProperties", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
+
+    @distributed_trace
+    def get_service_properties(
+        self, resource_group_name: str, account_name: str, **kwargs: Any
+    ) -> _models.TableServiceProperties:
+        """Gets the properties of a storage account’s Table service, including properties for Storage
+        Analytics and CORS (Cross-Origin Resource Sharing) rules.
+
+        :param resource_group_name: The name of the resource group within the user's subscription. The
+         name is case insensitive. Required.
+        :type resource_group_name: str
+        :param account_name: The name of the storage account within the specified resource group.
+         Storage account names must be between 3 and 24 characters in length and use numbers and
+         lower-case letters only. Required.
+        :type account_name: str
+        :return: TableServiceProperties or the result of cls(response)
+        :rtype: ~azure.mgmt.storage.v2024_01_01.models.TableServiceProperties
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        table_service_name: Literal["default"] = kwargs.pop("table_service_name", "default")
+        cls: ClsType[_models.TableServiceProperties] = kwargs.pop("cls", None)
+
+        _request = build_get_service_properties_request(
+            resource_group_name=resource_group_name,
+            account_name=account_name,
+            subscription_id=self._config.subscription_id,
+            api_version=api_version,
+            table_service_name=table_service_name,
+            headers=_headers,
+            params=_params,
+        )
+        _request.url = self._client.format_url(_request.url)
+
+        _stream = False
+        pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+            _request, stream=_stream, **kwargs
+        )
+
+        response = pipeline_response.http_response
+
+        if response.status_code not in [200]:
+            map_error(status_code=response.status_code, response=response, error_map=error_map)
+            raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+        deserialized = self._deserialize("TableServiceProperties", pipeline_response.http_response)
+
+        if cls:
+            return cls(pipeline_response, deserialized, {})  # type: ignore
+
+        return deserialized  # type: ignore
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/operations/_usages_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/operations/_usages_operations.py
new file mode 100644
index 000000000000..6f6b04b888bc
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/operations/_usages_operations.py
@@ -0,0 +1,164 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+import sys
+from typing import Any, Callable, Dict, Iterable, Optional, TypeVar
+import urllib.parse
+
+from azure.core.exceptions import (
+    ClientAuthenticationError,
+    HttpResponseError,
+    ResourceExistsError,
+    ResourceNotFoundError,
+    ResourceNotModifiedError,
+    map_error,
+)
+from azure.core.paging import ItemPaged
+from azure.core.pipeline import PipelineResponse
+from azure.core.rest import HttpRequest, HttpResponse
+from azure.core.tracing.decorator import distributed_trace
+from azure.core.utils import case_insensitive_dict
+from azure.mgmt.core.exceptions import ARMErrorFormat
+
+from .. import models as _models
+from ..._serialization import Serializer
+
+if sys.version_info >= (3, 9):
+    from collections.abc import MutableMapping
+else:
+    from typing import MutableMapping  # type: ignore
+T = TypeVar("T")
+ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
+
+_SERIALIZER = Serializer()
+_SERIALIZER.client_side_validation = False
+
+
+def build_list_by_location_request(location: str, 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-01-01"))
+    accept = _headers.pop("Accept", "application/json")
+
+    # Construct URL
+    _url = kwargs.pop(
+        "template_url", "/subscriptions/{subscriptionId}/providers/Microsoft.Storage/locations/{location}/usages"
+    )  # pylint: disable=line-too-long
+    path_format_arguments = {
+        "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1),
+        "location": _SERIALIZER.url("location", location, "str"),
+    }
+
+    _url: str = _url.format(**path_format_arguments)  # type: ignore
+
+    # Construct parameters
+    _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str")
+
+    # Construct headers
+    _headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
+
+    return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs)
+
+
+class UsagesOperations:
+    """
+    .. warning::
+        **DO NOT** instantiate this class directly.
+
+        Instead, you should access the following operations through
+        :class:`~azure.mgmt.storage.v2024_01_01.StorageManagementClient`'s
+        :attr:`usages` attribute.
+    """
+
+    models = _models
+
+    def __init__(self, *args, **kwargs):
+        input_args = list(args)
+        self._client = input_args.pop(0) if input_args else kwargs.pop("client")
+        self._config = input_args.pop(0) if input_args else kwargs.pop("config")
+        self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer")
+        self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer")
+        self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version")
+
+    @distributed_trace
+    def list_by_location(self, location: str, **kwargs: Any) -> Iterable["_models.Usage"]:
+        """Gets the current usage count and the limit for the resources of the location under the
+        subscription.
+
+        :param location: The location of the Azure Storage resource. Required.
+        :type location: str
+        :return: An iterator like instance of either Usage or the result of cls(response)
+        :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.storage.v2024_01_01.models.Usage]
+        :raises ~azure.core.exceptions.HttpResponseError:
+        """
+        _headers = kwargs.pop("headers", {}) or {}
+        _params = case_insensitive_dict(kwargs.pop("params", {}) or {})
+
+        api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._api_version or "2024-01-01"))
+        cls: ClsType[_models.UsageListResult] = kwargs.pop("cls", None)
+
+        error_map: MutableMapping = {
+            401: ClientAuthenticationError,
+            404: ResourceNotFoundError,
+            409: ResourceExistsError,
+            304: ResourceNotModifiedError,
+        }
+        error_map.update(kwargs.pop("error_map", {}) or {})
+
+        def prepare_request(next_link=None):
+            if not next_link:
+
+                _request = build_list_by_location_request(
+                    location=location,
+                    subscription_id=self._config.subscription_id,
+                    api_version=api_version,
+                    headers=_headers,
+                    params=_params,
+                )
+                _request.url = self._client.format_url(_request.url)
+
+            else:
+                # make call to next link with the client's api-version
+                _parsed_next_link = urllib.parse.urlparse(next_link)
+                _next_request_params = case_insensitive_dict(
+                    {
+                        key: [urllib.parse.quote(v) for v in value]
+                        for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items()
+                    }
+                )
+                _next_request_params["api-version"] = self._api_version
+                _request = HttpRequest(
+                    "GET", urllib.parse.urljoin(next_link, _parsed_next_link.path), params=_next_request_params
+                )
+                _request.url = self._client.format_url(_request.url)
+                _request.method = "GET"
+            return _request
+
+        def extract_data(pipeline_response):
+            deserialized = self._deserialize("UsageListResult", pipeline_response)
+            list_of_elem = deserialized.value
+            if cls:
+                list_of_elem = cls(list_of_elem)  # type: ignore
+            return None, iter(list_of_elem)
+
+        def get_next(next_link=None):
+            _request = prepare_request(next_link)
+
+            _stream = False
+            pipeline_response: PipelineResponse = self._client._pipeline.run(  # pylint: disable=protected-access
+                _request, stream=_stream, **kwargs
+            )
+            response = pipeline_response.http_response
+
+            if response.status_code not in [200]:
+                map_error(status_code=response.status_code, response=response, error_map=error_map)
+                raise HttpResponseError(response=response, error_format=ARMErrorFormat)
+
+            return pipeline_response
+
+        return ItemPaged(get_next, extract_data)
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/py.typed b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/py.typed
new file mode 100644
index 000000000000..e5aff4f83af8
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/v2024_01_01/py.typed
@@ -0,0 +1 @@
+# Marker file for PEP 561.
\ No newline at end of file
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/blob_containers_delete.py b/sdk/storage/azure-mgmt-storage/generated_samples/blob_containers_delete.py
index 0647bea170e6..f4e5ce359806 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/blob_containers_delete.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/blob_containers_delete.py
@@ -37,6 +37,6 @@ def main():
     )
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/BlobContainersDelete.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/BlobContainersDelete.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/blob_containers_delete_immutability_policy.py b/sdk/storage/azure-mgmt-storage/generated_samples/blob_containers_delete_immutability_policy.py
index 10afc162b462..48da047f06c7 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/blob_containers_delete_immutability_policy.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/blob_containers_delete_immutability_policy.py
@@ -39,6 +39,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/BlobContainersDeleteImmutabilityPolicy.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/BlobContainersDeleteImmutabilityPolicy.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/blob_containers_extend_immutability_policy.py b/sdk/storage/azure-mgmt-storage/generated_samples/blob_containers_extend_immutability_policy.py
index 9125b544d398..21da003ab629 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/blob_containers_extend_immutability_policy.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/blob_containers_extend_immutability_policy.py
@@ -39,6 +39,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/BlobContainersExtendImmutabilityPolicy.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/BlobContainersExtendImmutabilityPolicy.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/blob_containers_get.py b/sdk/storage/azure-mgmt-storage/generated_samples/blob_containers_get.py
index 81f028c9b85d..01cadd9a5f4d 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/blob_containers_get.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/blob_containers_get.py
@@ -38,6 +38,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/BlobContainersGet.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/BlobContainersGet.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/blob_containers_get_immutability_policy.py b/sdk/storage/azure-mgmt-storage/generated_samples/blob_containers_get_immutability_policy.py
index 7a22c6bed5e2..adddc10d3bb7 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/blob_containers_get_immutability_policy.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/blob_containers_get_immutability_policy.py
@@ -38,6 +38,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/BlobContainersGetImmutabilityPolicy.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/BlobContainersGetImmutabilityPolicy.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/blob_containers_get_with_allow_protected_append_writes_all.py b/sdk/storage/azure-mgmt-storage/generated_samples/blob_containers_get_with_allow_protected_append_writes_all.py
index 48ffa555e419..564f05021a4f 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/blob_containers_get_with_allow_protected_append_writes_all.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/blob_containers_get_with_allow_protected_append_writes_all.py
@@ -38,6 +38,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/BlobContainersGetWithAllowProtectedAppendWritesAll.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/BlobContainersGetWithAllowProtectedAppendWritesAll.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/blob_containers_lease_acquire.py b/sdk/storage/azure-mgmt-storage/generated_samples/blob_containers_lease_acquire.py
index 968c5d1f6c09..9c647fc2d3f9 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/blob_containers_lease_acquire.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/blob_containers_lease_acquire.py
@@ -38,6 +38,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/BlobContainersLease_Acquire.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/BlobContainersLease_Acquire.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/blob_containers_lease_break.py b/sdk/storage/azure-mgmt-storage/generated_samples/blob_containers_lease_break.py
index 3db1886c8fd6..f6eb103d01c4 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/blob_containers_lease_break.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/blob_containers_lease_break.py
@@ -38,6 +38,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/BlobContainersLease_Break.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/BlobContainersLease_Break.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/blob_containers_list.py b/sdk/storage/azure-mgmt-storage/generated_samples/blob_containers_list.py
index 0bff302e7c41..f9f25d2366ca 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/blob_containers_list.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/blob_containers_list.py
@@ -38,6 +38,6 @@ def main():
         print(item)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/BlobContainersList.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/BlobContainersList.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/blob_containers_lock_immutability_policy.py b/sdk/storage/azure-mgmt-storage/generated_samples/blob_containers_lock_immutability_policy.py
index c3ce51f495fe..9ea9e481f510 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/blob_containers_lock_immutability_policy.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/blob_containers_lock_immutability_policy.py
@@ -39,6 +39,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/BlobContainersLockImmutabilityPolicy.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/BlobContainersLockImmutabilityPolicy.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/blob_containers_patch.py b/sdk/storage/azure-mgmt-storage/generated_samples/blob_containers_patch.py
index c047abeebb38..96dda53ee8ff 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/blob_containers_patch.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/blob_containers_patch.py
@@ -6,8 +6,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import Any, IO, Union
-
 from azure.identity import DefaultAzureCredential
 
 from azure.mgmt.storage import StorageManagementClient
@@ -41,6 +39,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/BlobContainersPatch.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/BlobContainersPatch.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/blob_containers_put_default_encryption_scope.py b/sdk/storage/azure-mgmt-storage/generated_samples/blob_containers_put_default_encryption_scope.py
index f9b77e9611f6..670d9fe90726 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/blob_containers_put_default_encryption_scope.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/blob_containers_put_default_encryption_scope.py
@@ -6,8 +6,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import Any, IO, Union
-
 from azure.identity import DefaultAzureCredential
 
 from azure.mgmt.storage import StorageManagementClient
@@ -43,6 +41,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/BlobContainersPutDefaultEncryptionScope.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/BlobContainersPutDefaultEncryptionScope.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/blob_containers_put_immutability_policy.py b/sdk/storage/azure-mgmt-storage/generated_samples/blob_containers_put_immutability_policy.py
index 1ba027c17945..ba37d7c4cb96 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/blob_containers_put_immutability_policy.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/blob_containers_put_immutability_policy.py
@@ -38,6 +38,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/BlobContainersPutImmutabilityPolicy.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/BlobContainersPutImmutabilityPolicy.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/blob_containers_put_immutability_policy_allow_protected_append_writes_all.py b/sdk/storage/azure-mgmt-storage/generated_samples/blob_containers_put_immutability_policy_allow_protected_append_writes_all.py
index ff5e031fefd2..1b897cfb9fa0 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/blob_containers_put_immutability_policy_allow_protected_append_writes_all.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/blob_containers_put_immutability_policy_allow_protected_append_writes_all.py
@@ -38,6 +38,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/BlobContainersPutImmutabilityPolicyAllowProtectedAppendWritesAll.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/BlobContainersPutImmutabilityPolicyAllowProtectedAppendWritesAll.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/blob_containers_put_object_level_worm.py b/sdk/storage/azure-mgmt-storage/generated_samples/blob_containers_put_object_level_worm.py
index 14030b7fd92c..3fd2bae87e44 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/blob_containers_put_object_level_worm.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/blob_containers_put_object_level_worm.py
@@ -6,8 +6,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import Any, IO, Union
-
 from azure.identity import DefaultAzureCredential
 
 from azure.mgmt.storage import StorageManagementClient
@@ -41,6 +39,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/BlobContainersPutObjectLevelWorm.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/BlobContainersPutObjectLevelWorm.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/blob_ranges_restore.py b/sdk/storage/azure-mgmt-storage/generated_samples/blob_ranges_restore.py
index 87345687a7c0..3068af92d4a0 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/blob_ranges_restore.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/blob_ranges_restore.py
@@ -6,8 +6,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import Any, IO, Union
-
 from azure.identity import DefaultAzureCredential
 
 from azure.mgmt.storage import StorageManagementClient
@@ -46,6 +44,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/BlobRangesRestore.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/BlobRangesRestore.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/blob_services_get.py b/sdk/storage/azure-mgmt-storage/generated_samples/blob_services_get.py
index a4cf68c61cf9..4c8d7bae7d13 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/blob_services_get.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/blob_services_get.py
@@ -37,6 +37,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/BlobServicesGet.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/BlobServicesGet.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/blob_services_list.py b/sdk/storage/azure-mgmt-storage/generated_samples/blob_services_list.py
index 966b2eff5d5f..1ebdfbba09c9 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/blob_services_list.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/blob_services_list.py
@@ -38,6 +38,6 @@ def main():
         print(item)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/BlobServicesList.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/BlobServicesList.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/blob_services_put.py b/sdk/storage/azure-mgmt-storage/generated_samples/blob_services_put.py
index 8d7333f0e759..83181cab9851 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/blob_services_put.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/blob_services_put.py
@@ -6,8 +6,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import Any, IO, Union
-
 from azure.identity import DefaultAzureCredential
 
 from azure.mgmt.storage import StorageManagementClient
@@ -72,6 +70,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/BlobServicesPut.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/BlobServicesPut.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/blob_services_put_allow_permanent_delete.py b/sdk/storage/azure-mgmt-storage/generated_samples/blob_services_put_allow_permanent_delete.py
index 02431ce8c2c8..438f52002fdb 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/blob_services_put_allow_permanent_delete.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/blob_services_put_allow_permanent_delete.py
@@ -6,8 +6,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import Any, IO, Union
-
 from azure.identity import DefaultAzureCredential
 
 from azure.mgmt.storage import StorageManagementClient
@@ -45,6 +43,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/BlobServicesPutAllowPermanentDelete.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/BlobServicesPutAllowPermanentDelete.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/blob_services_put_last_access_time_based_tracking.py b/sdk/storage/azure-mgmt-storage/generated_samples/blob_services_put_last_access_time_based_tracking.py
index ca7a52356b80..682313c19066 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/blob_services_put_last_access_time_based_tracking.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/blob_services_put_last_access_time_based_tracking.py
@@ -6,8 +6,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import Any, IO, Union
-
 from azure.identity import DefaultAzureCredential
 
 from azure.mgmt.storage import StorageManagementClient
@@ -49,6 +47,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/BlobServicesPutLastAccessTimeBasedTracking.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/BlobServicesPutLastAccessTimeBasedTracking.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/deleted_account_get.py b/sdk/storage/azure-mgmt-storage/generated_samples/deleted_account_get.py
index ba8d33411c5c..15c79b16d0b9 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/deleted_account_get.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/deleted_account_get.py
@@ -37,6 +37,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/DeletedAccountGet.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/DeletedAccountGet.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/deleted_account_list.py b/sdk/storage/azure-mgmt-storage/generated_samples/deleted_account_list.py
index e3ebe4a1035f..14584f86c5f7 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/deleted_account_list.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/deleted_account_list.py
@@ -35,6 +35,6 @@ def main():
         print(item)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/DeletedAccountList.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/DeletedAccountList.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/deleted_blob_containers_list.py b/sdk/storage/azure-mgmt-storage/generated_samples/deleted_blob_containers_list.py
index 2fd7a6e1368e..14fb740c4e8a 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/deleted_blob_containers_list.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/deleted_blob_containers_list.py
@@ -38,6 +38,6 @@ def main():
         print(item)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/DeletedBlobContainersList.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/DeletedBlobContainersList.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/deleted_file_shares_list.py b/sdk/storage/azure-mgmt-storage/generated_samples/deleted_file_shares_list.py
index e36f575e7f0c..1ecfd975e18e 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/deleted_file_shares_list.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/deleted_file_shares_list.py
@@ -38,6 +38,6 @@ def main():
         print(item)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/DeletedFileSharesList.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/DeletedFileSharesList.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/file_services_get.py b/sdk/storage/azure-mgmt-storage/generated_samples/file_services_get.py
index 1c2bf1e2edcd..6b052273b8d9 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/file_services_get.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/file_services_get.py
@@ -37,6 +37,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/FileServicesGet.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/FileServicesGet.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/file_services_get_usage.py b/sdk/storage/azure-mgmt-storage/generated_samples/file_services_get_usage.py
new file mode 100644
index 000000000000..de607f14161a
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/file_services_get_usage.py
@@ -0,0 +1,42 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+
+from azure.identity import DefaultAzureCredential
+
+from azure.mgmt.storage import StorageManagementClient
+
+"""
+# PREREQUISITES
+    pip install azure-identity
+    pip install azure-mgmt-storage
+# USAGE
+    python file_services_get_usage.py
+
+    Before run the sample, please set the values of the client ID, tenant ID and client secret
+    of the AAD application as environment variables: AZURE_CLIENT_ID, AZURE_TENANT_ID,
+    AZURE_CLIENT_SECRET. For more info about how to get the value, please see:
+    https://docs.microsoft.com/azure/active-directory/develop/howto-create-service-principal-portal
+"""
+
+
+def main():
+    client = StorageManagementClient(
+        credential=DefaultAzureCredential(),
+        subscription_id="00000000-1111-2222-3333-444444444444",
+    )
+
+    response = client.file_services.get_service_usage(
+        resource_group_name="res4410",
+        account_name="sto8607",
+    )
+    print(response)
+
+
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/FileServicesGetUsage.json
+if __name__ == "__main__":
+    main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/file_services_list.py b/sdk/storage/azure-mgmt-storage/generated_samples/file_services_list.py
index cbd54d1e6a8d..c3e8c4157339 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/file_services_list.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/file_services_list.py
@@ -37,6 +37,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/FileServicesList.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/FileServicesList.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/file_services_list_usages.py b/sdk/storage/azure-mgmt-storage/generated_samples/file_services_list_usages.py
new file mode 100644
index 000000000000..aa8e5e9b946e
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/file_services_list_usages.py
@@ -0,0 +1,43 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+
+from azure.identity import DefaultAzureCredential
+
+from azure.mgmt.storage import StorageManagementClient
+
+"""
+# PREREQUISITES
+    pip install azure-identity
+    pip install azure-mgmt-storage
+# USAGE
+    python file_services_list_usages.py
+
+    Before run the sample, please set the values of the client ID, tenant ID and client secret
+    of the AAD application as environment variables: AZURE_CLIENT_ID, AZURE_TENANT_ID,
+    AZURE_CLIENT_SECRET. For more info about how to get the value, please see:
+    https://docs.microsoft.com/azure/active-directory/develop/howto-create-service-principal-portal
+"""
+
+
+def main():
+    client = StorageManagementClient(
+        credential=DefaultAzureCredential(),
+        subscription_id="00000000-1111-2222-3333-444444444444",
+    )
+
+    response = client.file_services.list_service_usages(
+        resource_group_name="res4410",
+        account_name="sto8607",
+    )
+    for item in response:
+        print(item)
+
+
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/FileServicesListUsages.json
+if __name__ == "__main__":
+    main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/file_services_put.py b/sdk/storage/azure-mgmt-storage/generated_samples/file_services_put.py
index 3c8a31f1da50..9c6f3c5ef388 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/file_services_put.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/file_services_put.py
@@ -6,8 +6,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import Any, IO, Union
-
 from azure.identity import DefaultAzureCredential
 
 from azure.mgmt.storage import StorageManagementClient
@@ -68,6 +66,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/FileServicesPut.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/FileServicesPut.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/file_services_put_enable_secure_smb_features.py b/sdk/storage/azure-mgmt-storage/generated_samples/file_services_put_enable_secure_smb_features.py
index 5317baba8232..6442591dd87e 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/file_services_put_enable_secure_smb_features.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/file_services_put_enable_secure_smb_features.py
@@ -6,8 +6,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import Any, IO, Union
-
 from azure.identity import DefaultAzureCredential
 
 from azure.mgmt.storage import StorageManagementClient
@@ -51,6 +49,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/FileServicesPut_EnableSecureSmbFeatures.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/FileServicesPut_EnableSecureSmbFeatures.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/file_services_put_enable_smb_multichannel.py b/sdk/storage/azure-mgmt-storage/generated_samples/file_services_put_enable_smb_multichannel.py
index 384d000492b4..fa5e0f30e706 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/file_services_put_enable_smb_multichannel.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/file_services_put_enable_smb_multichannel.py
@@ -6,8 +6,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import Any, IO, Union
-
 from azure.identity import DefaultAzureCredential
 
 from azure.mgmt.storage import StorageManagementClient
@@ -40,6 +38,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/FileServicesPut_EnableSMBMultichannel.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/FileServicesPut_EnableSMBMultichannel.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/file_share_acls_patch.py b/sdk/storage/azure-mgmt-storage/generated_samples/file_share_acls_patch.py
index 287ea96f5ee6..6151095ce563 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/file_share_acls_patch.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/file_share_acls_patch.py
@@ -6,8 +6,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import Any, IO, Union
-
 from azure.identity import DefaultAzureCredential
 
 from azure.mgmt.storage import StorageManagementClient
@@ -54,6 +52,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/FileShareAclsPatch.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/FileShareAclsPatch.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/file_share_snapshots_list.py b/sdk/storage/azure-mgmt-storage/generated_samples/file_share_snapshots_list.py
index 192b576cca84..6ad11c0f8de1 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/file_share_snapshots_list.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/file_share_snapshots_list.py
@@ -38,6 +38,6 @@ def main():
         print(item)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/FileShareSnapshotsList.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/FileShareSnapshotsList.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/file_shares_delete.py b/sdk/storage/azure-mgmt-storage/generated_samples/file_shares_delete.py
index 67d728b6833e..520feab52cdd 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/file_shares_delete.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/file_shares_delete.py
@@ -37,6 +37,6 @@ def main():
     )
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/FileSharesDelete.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/FileSharesDelete.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/file_shares_get.py b/sdk/storage/azure-mgmt-storage/generated_samples/file_shares_get.py
index d32599aa7432..0d7ab552d4b7 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/file_shares_get.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/file_shares_get.py
@@ -38,6 +38,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/FileSharesGet.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/FileSharesGet.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/file_shares_get_paid_bursting.py b/sdk/storage/azure-mgmt-storage/generated_samples/file_shares_get_paid_bursting.py
new file mode 100644
index 000000000000..272364f81e7a
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/file_shares_get_paid_bursting.py
@@ -0,0 +1,43 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+
+from azure.identity import DefaultAzureCredential
+
+from azure.mgmt.storage import StorageManagementClient
+
+"""
+# PREREQUISITES
+    pip install azure-identity
+    pip install azure-mgmt-storage
+# USAGE
+    python file_shares_get_paid_bursting.py
+
+    Before run the sample, please set the values of the client ID, tenant ID and client secret
+    of the AAD application as environment variables: AZURE_CLIENT_ID, AZURE_TENANT_ID,
+    AZURE_CLIENT_SECRET. For more info about how to get the value, please see:
+    https://docs.microsoft.com/azure/active-directory/develop/howto-create-service-principal-portal
+"""
+
+
+def main():
+    client = StorageManagementClient(
+        credential=DefaultAzureCredential(),
+        subscription_id="{subscription-id}",
+    )
+
+    response = client.file_shares.get(
+        resource_group_name="res9871",
+        account_name="sto6217",
+        share_name="share1634",
+    )
+    print(response)
+
+
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/FileSharesGet_PaidBursting.json
+if __name__ == "__main__":
+    main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/file_shares_get_provisioned_v2.py b/sdk/storage/azure-mgmt-storage/generated_samples/file_shares_get_provisioned_v2.py
new file mode 100644
index 000000000000..c73a4c1f035d
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/file_shares_get_provisioned_v2.py
@@ -0,0 +1,43 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+
+from azure.identity import DefaultAzureCredential
+
+from azure.mgmt.storage import StorageManagementClient
+
+"""
+# PREREQUISITES
+    pip install azure-identity
+    pip install azure-mgmt-storage
+# USAGE
+    python file_shares_get_provisioned_v2.py
+
+    Before run the sample, please set the values of the client ID, tenant ID and client secret
+    of the AAD application as environment variables: AZURE_CLIENT_ID, AZURE_TENANT_ID,
+    AZURE_CLIENT_SECRET. For more info about how to get the value, please see:
+    https://docs.microsoft.com/azure/active-directory/develop/howto-create-service-principal-portal
+"""
+
+
+def main():
+    client = StorageManagementClient(
+        credential=DefaultAzureCredential(),
+        subscription_id="{subscription-id}",
+    )
+
+    response = client.file_shares.get(
+        resource_group_name="res9871",
+        account_name="sto6217",
+        share_name="share1634",
+    )
+    print(response)
+
+
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/FileSharesGet_ProvisionedV2.json
+if __name__ == "__main__":
+    main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/file_shares_get_stats.py b/sdk/storage/azure-mgmt-storage/generated_samples/file_shares_get_stats.py
index fc620ded54b5..44b3177eb210 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/file_shares_get_stats.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/file_shares_get_stats.py
@@ -38,6 +38,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/FileSharesGet_Stats.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/FileSharesGet_Stats.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/file_shares_lease_acquire.py b/sdk/storage/azure-mgmt-storage/generated_samples/file_shares_lease_acquire.py
index 1a617340938f..e2023aacca57 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/file_shares_lease_acquire.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/file_shares_lease_acquire.py
@@ -38,6 +38,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/FileSharesLease_Acquire.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/FileSharesLease_Acquire.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/file_shares_lease_break.py b/sdk/storage/azure-mgmt-storage/generated_samples/file_shares_lease_break.py
index 1265433c6195..7de7ad26af6a 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/file_shares_lease_break.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/file_shares_lease_break.py
@@ -38,6 +38,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/FileSharesLease_Break.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/FileSharesLease_Break.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/file_shares_list.py b/sdk/storage/azure-mgmt-storage/generated_samples/file_shares_list.py
index d993e582b6cc..fc328c89936c 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/file_shares_list.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/file_shares_list.py
@@ -38,6 +38,6 @@ def main():
         print(item)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/FileSharesList.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/FileSharesList.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/file_shares_list_paid_bursting.py b/sdk/storage/azure-mgmt-storage/generated_samples/file_shares_list_paid_bursting.py
new file mode 100644
index 000000000000..1622f54bc12e
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/file_shares_list_paid_bursting.py
@@ -0,0 +1,43 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+
+from azure.identity import DefaultAzureCredential
+
+from azure.mgmt.storage import StorageManagementClient
+
+"""
+# PREREQUISITES
+    pip install azure-identity
+    pip install azure-mgmt-storage
+# USAGE
+    python file_shares_list_paid_bursting.py
+
+    Before run the sample, please set the values of the client ID, tenant ID and client secret
+    of the AAD application as environment variables: AZURE_CLIENT_ID, AZURE_TENANT_ID,
+    AZURE_CLIENT_SECRET. For more info about how to get the value, please see:
+    https://docs.microsoft.com/azure/active-directory/develop/howto-create-service-principal-portal
+"""
+
+
+def main():
+    client = StorageManagementClient(
+        credential=DefaultAzureCredential(),
+        subscription_id="{subscription-id}",
+    )
+
+    response = client.file_shares.list(
+        resource_group_name="res9290",
+        account_name="sto1590",
+    )
+    for item in response:
+        print(item)
+
+
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/FileSharesList_PaidBursting.json
+if __name__ == "__main__":
+    main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/file_shares_list_provisioned_v2.py b/sdk/storage/azure-mgmt-storage/generated_samples/file_shares_list_provisioned_v2.py
new file mode 100644
index 000000000000..11f969e00803
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/file_shares_list_provisioned_v2.py
@@ -0,0 +1,43 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+
+from azure.identity import DefaultAzureCredential
+
+from azure.mgmt.storage import StorageManagementClient
+
+"""
+# PREREQUISITES
+    pip install azure-identity
+    pip install azure-mgmt-storage
+# USAGE
+    python file_shares_list_provisioned_v2.py
+
+    Before run the sample, please set the values of the client ID, tenant ID and client secret
+    of the AAD application as environment variables: AZURE_CLIENT_ID, AZURE_TENANT_ID,
+    AZURE_CLIENT_SECRET. For more info about how to get the value, please see:
+    https://docs.microsoft.com/azure/active-directory/develop/howto-create-service-principal-portal
+"""
+
+
+def main():
+    client = StorageManagementClient(
+        credential=DefaultAzureCredential(),
+        subscription_id="{subscription-id}",
+    )
+
+    response = client.file_shares.list(
+        resource_group_name="res9290",
+        account_name="sto1590",
+    )
+    for item in response:
+        print(item)
+
+
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/FileSharesList_ProvisionedV2.json
+if __name__ == "__main__":
+    main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/file_shares_patch.py b/sdk/storage/azure-mgmt-storage/generated_samples/file_shares_patch.py
index 12117c36f6ea..fda0fe0d9754 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/file_shares_patch.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/file_shares_patch.py
@@ -6,8 +6,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import Any, IO, Union
-
 from azure.identity import DefaultAzureCredential
 
 from azure.mgmt.storage import StorageManagementClient
@@ -41,6 +39,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/FileSharesPatch.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/FileSharesPatch.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/file_shares_patch_paid_bursting.py b/sdk/storage/azure-mgmt-storage/generated_samples/file_shares_patch_paid_bursting.py
new file mode 100644
index 000000000000..5cead2571831
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/file_shares_patch_paid_bursting.py
@@ -0,0 +1,52 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+
+from azure.identity import DefaultAzureCredential
+
+from azure.mgmt.storage import StorageManagementClient
+
+"""
+# PREREQUISITES
+    pip install azure-identity
+    pip install azure-mgmt-storage
+# USAGE
+    python file_shares_patch_paid_bursting.py
+
+    Before run the sample, please set the values of the client ID, tenant ID and client secret
+    of the AAD application as environment variables: AZURE_CLIENT_ID, AZURE_TENANT_ID,
+    AZURE_CLIENT_SECRET. For more info about how to get the value, please see:
+    https://docs.microsoft.com/azure/active-directory/develop/howto-create-service-principal-portal
+"""
+
+
+def main():
+    client = StorageManagementClient(
+        credential=DefaultAzureCredential(),
+        subscription_id="{subscription-id}",
+    )
+
+    response = client.file_shares.update(
+        resource_group_name="res3376",
+        account_name="sto328",
+        share_name="share6185",
+        file_share={
+            "properties": {
+                "fileSharePaidBursting": {
+                    "paidBurstingEnabled": True,
+                    "paidBurstingMaxBandwidthMibps": 10340,
+                    "paidBurstingMaxIops": 102400,
+                }
+            }
+        },
+    )
+    print(response)
+
+
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/FileSharesPatch_PaidBursting.json
+if __name__ == "__main__":
+    main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/file_shares_patch_provisioned_v2.py b/sdk/storage/azure-mgmt-storage/generated_samples/file_shares_patch_provisioned_v2.py
new file mode 100644
index 000000000000..07df120119e9
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/file_shares_patch_provisioned_v2.py
@@ -0,0 +1,44 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+
+from azure.identity import DefaultAzureCredential
+
+from azure.mgmt.storage import StorageManagementClient
+
+"""
+# PREREQUISITES
+    pip install azure-identity
+    pip install azure-mgmt-storage
+# USAGE
+    python file_shares_patch_provisioned_v2.py
+
+    Before run the sample, please set the values of the client ID, tenant ID and client secret
+    of the AAD application as environment variables: AZURE_CLIENT_ID, AZURE_TENANT_ID,
+    AZURE_CLIENT_SECRET. For more info about how to get the value, please see:
+    https://docs.microsoft.com/azure/active-directory/develop/howto-create-service-principal-portal
+"""
+
+
+def main():
+    client = StorageManagementClient(
+        credential=DefaultAzureCredential(),
+        subscription_id="{subscription-id}",
+    )
+
+    response = client.file_shares.update(
+        resource_group_name="res3376",
+        account_name="sto328",
+        share_name="share6185",
+        file_share={"properties": {"provisionedBandwidthMibps": 200, "provisionedIops": 5000, "shareQuota": 100}},
+    )
+    print(response)
+
+
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/FileSharesPatch_ProvisionedV2.json
+if __name__ == "__main__":
+    main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/file_shares_put_access_tier.py b/sdk/storage/azure-mgmt-storage/generated_samples/file_shares_put_access_tier.py
index 1e569c217ff6..0d3cb4031bbc 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/file_shares_put_access_tier.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/file_shares_put_access_tier.py
@@ -6,8 +6,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import Any, IO, Union
-
 from azure.identity import DefaultAzureCredential
 
 from azure.mgmt.storage import StorageManagementClient
@@ -41,6 +39,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/FileSharesPut_AccessTier.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/FileSharesPut_AccessTier.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/file_shares_put_nfs.py b/sdk/storage/azure-mgmt-storage/generated_samples/file_shares_put_nfs.py
index aeb4757e623d..a847a080d238 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/file_shares_put_nfs.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/file_shares_put_nfs.py
@@ -6,8 +6,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import Any, IO, Union
-
 from azure.identity import DefaultAzureCredential
 
 from azure.mgmt.storage import StorageManagementClient
@@ -41,6 +39,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/FileSharesPut_NFS.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/FileSharesPut_NFS.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/file_shares_put_paid_bursting.py b/sdk/storage/azure-mgmt-storage/generated_samples/file_shares_put_paid_bursting.py
new file mode 100644
index 000000000000..8949a338386f
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/file_shares_put_paid_bursting.py
@@ -0,0 +1,52 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+
+from azure.identity import DefaultAzureCredential
+
+from azure.mgmt.storage import StorageManagementClient
+
+"""
+# PREREQUISITES
+    pip install azure-identity
+    pip install azure-mgmt-storage
+# USAGE
+    python file_shares_put_paid_bursting.py
+
+    Before run the sample, please set the values of the client ID, tenant ID and client secret
+    of the AAD application as environment variables: AZURE_CLIENT_ID, AZURE_TENANT_ID,
+    AZURE_CLIENT_SECRET. For more info about how to get the value, please see:
+    https://docs.microsoft.com/azure/active-directory/develop/howto-create-service-principal-portal
+"""
+
+
+def main():
+    client = StorageManagementClient(
+        credential=DefaultAzureCredential(),
+        subscription_id="{subscription-id}",
+    )
+
+    response = client.file_shares.create(
+        resource_group_name="res346",
+        account_name="sto666",
+        share_name="share1235",
+        file_share={
+            "properties": {
+                "fileSharePaidBursting": {
+                    "paidBurstingEnabled": True,
+                    "paidBurstingMaxBandwidthMibps": 10340,
+                    "paidBurstingMaxIops": 102400,
+                }
+            }
+        },
+    )
+    print(response)
+
+
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/FileSharesPut_PaidBursting.json
+if __name__ == "__main__":
+    main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/file_shares_put_provisioned_v2.py b/sdk/storage/azure-mgmt-storage/generated_samples/file_shares_put_provisioned_v2.py
new file mode 100644
index 000000000000..6573f3ffe423
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/file_shares_put_provisioned_v2.py
@@ -0,0 +1,44 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+
+from azure.identity import DefaultAzureCredential
+
+from azure.mgmt.storage import StorageManagementClient
+
+"""
+# PREREQUISITES
+    pip install azure-identity
+    pip install azure-mgmt-storage
+# USAGE
+    python file_shares_put_provisioned_v2.py
+
+    Before run the sample, please set the values of the client ID, tenant ID and client secret
+    of the AAD application as environment variables: AZURE_CLIENT_ID, AZURE_TENANT_ID,
+    AZURE_CLIENT_SECRET. For more info about how to get the value, please see:
+    https://docs.microsoft.com/azure/active-directory/develop/howto-create-service-principal-portal
+"""
+
+
+def main():
+    client = StorageManagementClient(
+        credential=DefaultAzureCredential(),
+        subscription_id="{subscription-id}",
+    )
+
+    response = client.file_shares.create(
+        resource_group_name="res346",
+        account_name="sto666",
+        share_name="share1235",
+        file_share={"properties": {"provisionedBandwidthMibps": 200, "provisionedIops": 5000, "shareQuota": 100}},
+    )
+    print(response)
+
+
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/FileSharesPut_ProvisionedV2.json
+if __name__ == "__main__":
+    main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/file_shares_restore.py b/sdk/storage/azure-mgmt-storage/generated_samples/file_shares_restore.py
index a48b7319547a..1d0a23e18102 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/file_shares_restore.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/file_shares_restore.py
@@ -6,8 +6,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import Any, IO, Union
-
 from azure.identity import DefaultAzureCredential
 
 from azure.mgmt.storage import StorageManagementClient
@@ -40,6 +38,6 @@ def main():
     )
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/FileSharesRestore.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/FileSharesRestore.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/local_user_create.py b/sdk/storage/azure-mgmt-storage/generated_samples/local_user_create.py
index 86a58f18e116..74c91178a686 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/local_user_create.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/local_user_create.py
@@ -6,8 +6,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import Any, IO, Union
-
 from azure.identity import DefaultAzureCredential
 
 from azure.mgmt.storage import StorageManagementClient
@@ -53,6 +51,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/LocalUserCreate.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/LocalUserCreate.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/local_user_create_nf_sv3_enabled.py b/sdk/storage/azure-mgmt-storage/generated_samples/local_user_create_nf_sv3_enabled.py
index 345bba3efcc9..273bfa1a00eb 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/local_user_create_nf_sv3_enabled.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/local_user_create_nf_sv3_enabled.py
@@ -6,8 +6,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import Any, IO, Union
-
 from azure.identity import DefaultAzureCredential
 
 from azure.mgmt.storage import StorageManagementClient
@@ -41,6 +39,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/LocalUserCreateNFSv3Enabled.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/LocalUserCreateNFSv3Enabled.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/local_user_delete.py b/sdk/storage/azure-mgmt-storage/generated_samples/local_user_delete.py
index 83e8b8f8fa5b..8479544f44b0 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/local_user_delete.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/local_user_delete.py
@@ -37,6 +37,6 @@ def main():
     )
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/LocalUserDelete.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/LocalUserDelete.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/local_user_get.py b/sdk/storage/azure-mgmt-storage/generated_samples/local_user_get.py
index c05559860406..28ac9651483b 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/local_user_get.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/local_user_get.py
@@ -38,6 +38,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/LocalUserGet.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/LocalUserGet.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/local_user_list_keys.py b/sdk/storage/azure-mgmt-storage/generated_samples/local_user_list_keys.py
index 2600b58407e7..7569baca5ef8 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/local_user_list_keys.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/local_user_list_keys.py
@@ -38,6 +38,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/LocalUserListKeys.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/LocalUserListKeys.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/local_user_regenerate_password.py b/sdk/storage/azure-mgmt-storage/generated_samples/local_user_regenerate_password.py
index f28f54ceb654..929ba87944dc 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/local_user_regenerate_password.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/local_user_regenerate_password.py
@@ -38,6 +38,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/LocalUserRegeneratePassword.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/LocalUserRegeneratePassword.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/local_user_update.py b/sdk/storage/azure-mgmt-storage/generated_samples/local_user_update.py
index 0dae42be8134..441a6e739df3 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/local_user_update.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/local_user_update.py
@@ -6,8 +6,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import Any, IO, Union
-
 from azure.identity import DefaultAzureCredential
 
 from azure.mgmt.storage import StorageManagementClient
@@ -52,6 +50,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/LocalUserUpdate.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/LocalUserUpdate.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/local_users_list.py b/sdk/storage/azure-mgmt-storage/generated_samples/local_users_list.py
index 1b5668769d98..e87a6bbd3f83 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/local_users_list.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/local_users_list.py
@@ -38,6 +38,6 @@ def main():
         print(item)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/LocalUsersList.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/LocalUsersList.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/local_users_list_nf_sv3_enabled.py b/sdk/storage/azure-mgmt-storage/generated_samples/local_users_list_nf_sv3_enabled.py
index 432234d5f5e8..be998305a0e0 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/local_users_list_nf_sv3_enabled.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/local_users_list_nf_sv3_enabled.py
@@ -38,6 +38,6 @@ def main():
         print(item)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/LocalUsersListNFSv3Enabled.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/LocalUsersListNFSv3Enabled.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/network_security_perimeter_configuration_get.py b/sdk/storage/azure-mgmt-storage/generated_samples/network_security_perimeter_configuration_get.py
index 79c700d56bf9..1cfc79b225ec 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/network_security_perimeter_configuration_get.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/network_security_perimeter_configuration_get.py
@@ -38,6 +38,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/NetworkSecurityPerimeterConfigurationGet.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/NetworkSecurityPerimeterConfigurationGet.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/network_security_perimeter_configuration_list.py b/sdk/storage/azure-mgmt-storage/generated_samples/network_security_perimeter_configuration_list.py
index 6ac0f53f55b7..5caad662fd6d 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/network_security_perimeter_configuration_list.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/network_security_perimeter_configuration_list.py
@@ -38,6 +38,6 @@ def main():
         print(item)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/NetworkSecurityPerimeterConfigurationList.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/NetworkSecurityPerimeterConfigurationList.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/network_security_perimeter_configuration_reconcile.py b/sdk/storage/azure-mgmt-storage/generated_samples/network_security_perimeter_configuration_reconcile.py
index dd3d8ef7ee24..a604c2542df9 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/network_security_perimeter_configuration_reconcile.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/network_security_perimeter_configuration_reconcile.py
@@ -37,6 +37,6 @@ def main():
     ).result()
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/NetworkSecurityPerimeterConfigurationReconcile.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/NetworkSecurityPerimeterConfigurationReconcile.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/nfs_v3_account_create.py b/sdk/storage/azure-mgmt-storage/generated_samples/nfs_v3_account_create.py
index 5f8d6c779983..73154c7a47e8 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/nfs_v3_account_create.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/nfs_v3_account_create.py
@@ -6,8 +6,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import Any, IO, Union
-
 from azure.identity import DefaultAzureCredential
 
 from azure.mgmt.storage import StorageManagementClient
@@ -60,6 +58,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/NfsV3AccountCreate.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/NfsV3AccountCreate.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/object_level_worm_container_migration.py b/sdk/storage/azure-mgmt-storage/generated_samples/object_level_worm_container_migration.py
index 26d30a90e301..e5dd38701b57 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/object_level_worm_container_migration.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/object_level_worm_container_migration.py
@@ -37,6 +37,6 @@ def main():
     ).result()
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/ObjectLevelWormContainerMigration.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/ObjectLevelWormContainerMigration.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/operations_list.py b/sdk/storage/azure-mgmt-storage/generated_samples/operations_list.py
index 84a6d96cb7ad..2fa3ac0412ba 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/operations_list.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/operations_list.py
@@ -35,6 +35,6 @@ def main():
         print(item)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/OperationsList.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/OperationsList.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/queue_operation_delete.py b/sdk/storage/azure-mgmt-storage/generated_samples/queue_operation_delete.py
index eba135f88343..441b239d0ea5 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/queue_operation_delete.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/queue_operation_delete.py
@@ -37,6 +37,6 @@ def main():
     )
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/QueueOperationDelete.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/QueueOperationDelete.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/queue_operation_get.py b/sdk/storage/azure-mgmt-storage/generated_samples/queue_operation_get.py
index 153545cb62af..e1ca670d98cd 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/queue_operation_get.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/queue_operation_get.py
@@ -38,6 +38,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/QueueOperationGet.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/QueueOperationGet.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/queue_operation_list.py b/sdk/storage/azure-mgmt-storage/generated_samples/queue_operation_list.py
index 215a93cc2d12..3503ad287d4d 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/queue_operation_list.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/queue_operation_list.py
@@ -38,6 +38,6 @@ def main():
         print(item)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/QueueOperationList.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/QueueOperationList.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/queue_operation_put_with_metadata.py b/sdk/storage/azure-mgmt-storage/generated_samples/queue_operation_put_with_metadata.py
index 69e9ab2d0f9f..6c34dc0679a9 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/queue_operation_put_with_metadata.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/queue_operation_put_with_metadata.py
@@ -6,8 +6,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import Any, IO, Union
-
 from azure.identity import DefaultAzureCredential
 
 from azure.mgmt.storage import StorageManagementClient
@@ -41,6 +39,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/QueueOperationPutWithMetadata.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/QueueOperationPutWithMetadata.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/queue_services_get.py b/sdk/storage/azure-mgmt-storage/generated_samples/queue_services_get.py
index c2896553fd57..3934b2c3e611 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/queue_services_get.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/queue_services_get.py
@@ -37,6 +37,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/QueueServicesGet.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/QueueServicesGet.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/queue_services_list.py b/sdk/storage/azure-mgmt-storage/generated_samples/queue_services_list.py
index f5e00b2d8e63..d63f2c9666fc 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/queue_services_list.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/queue_services_list.py
@@ -37,6 +37,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/QueueServicesList.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/QueueServicesList.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/queue_services_put.py b/sdk/storage/azure-mgmt-storage/generated_samples/queue_services_put.py
index 57522ee7e201..9c8bc851e4df 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/queue_services_put.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/queue_services_put.py
@@ -6,8 +6,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import Any, IO, Union
-
 from azure.identity import DefaultAzureCredential
 
 from azure.mgmt.storage import StorageManagementClient
@@ -68,6 +66,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/QueueServicesPut.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/QueueServicesPut.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/sku_list.py b/sdk/storage/azure-mgmt-storage/generated_samples/sku_list.py
index d1eb3e5734ca..e74c2d835ff0 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/sku_list.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/sku_list.py
@@ -35,6 +35,6 @@ def main():
         print(item)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/SKUList.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/SKUList.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_abort_hierarchical_namespace_migration.py b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_abort_hierarchical_namespace_migration.py
index 98bac60a5ece..686c827c1779 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_abort_hierarchical_namespace_migration.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_abort_hierarchical_namespace_migration.py
@@ -36,6 +36,6 @@ def main():
     ).result()
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/StorageAccountAbortHierarchicalNamespaceMigration.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/StorageAccountAbortHierarchicalNamespaceMigration.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_check_name_availability.py b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_check_name_availability.py
index eedccac9cefd..49a1fc49d54b 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_check_name_availability.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_check_name_availability.py
@@ -6,8 +6,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import Any, IO, Union
-
 from azure.identity import DefaultAzureCredential
 
 from azure.mgmt.storage import StorageManagementClient
@@ -38,6 +36,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/StorageAccountCheckNameAvailability.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/StorageAccountCheckNameAvailability.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_create.py b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_create.py
index d28e4807c29f..f733f1548581 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_create.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_create.py
@@ -6,8 +6,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import Any, IO, Union
-
 from azure.identity import DefaultAzureCredential
 
 from azure.mgmt.storage import StorageManagementClient
@@ -69,6 +67,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/StorageAccountCreate.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/StorageAccountCreate.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_create_allowed_copy_scope_to_aad.py b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_create_allowed_copy_scope_to_aad.py
index 8ef790ad73ad..9a408a57b9ac 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_create_allowed_copy_scope_to_aad.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_create_allowed_copy_scope_to_aad.py
@@ -6,8 +6,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import Any, IO, Union
-
 from azure.identity import DefaultAzureCredential
 
 from azure.mgmt.storage import StorageManagementClient
@@ -67,6 +65,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/StorageAccountCreateAllowedCopyScopeToAAD.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/StorageAccountCreateAllowedCopyScopeToAAD.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_create_allowed_copy_scope_to_private_link.py b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_create_allowed_copy_scope_to_private_link.py
index 9513936e0903..82fc5f2aa6fa 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_create_allowed_copy_scope_to_private_link.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_create_allowed_copy_scope_to_private_link.py
@@ -6,8 +6,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import Any, IO, Union
-
 from azure.identity import DefaultAzureCredential
 
 from azure.mgmt.storage import StorageManagementClient
@@ -67,6 +65,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/StorageAccountCreateAllowedCopyScopeToPrivateLink.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/StorageAccountCreateAllowedCopyScopeToPrivateLink.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_create_disallow_public_network_access.py b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_create_disallow_public_network_access.py
index 30da22af8cc7..ca6766000310 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_create_disallow_public_network_access.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_create_disallow_public_network_access.py
@@ -6,8 +6,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import Any, IO, Union
-
 from azure.identity import DefaultAzureCredential
 
 from azure.mgmt.storage import StorageManagementClient
@@ -68,6 +66,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/StorageAccountCreateDisallowPublicNetworkAccess.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/StorageAccountCreateDisallowPublicNetworkAccess.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_create_dns_endpoint_type_to_azure_dns_zone.py b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_create_dns_endpoint_type_to_azure_dns_zone.py
index f6bd2c07ad4d..07abd9ea8879 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_create_dns_endpoint_type_to_azure_dns_zone.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_create_dns_endpoint_type_to_azure_dns_zone.py
@@ -6,8 +6,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import Any, IO, Union
-
 from azure.identity import DefaultAzureCredential
 
 from azure.mgmt.storage import StorageManagementClient
@@ -70,6 +68,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/StorageAccountCreateDnsEndpointTypeToAzureDnsZone.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/StorageAccountCreateDnsEndpointTypeToAzureDnsZone.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_create_dns_endpoint_type_to_standard.py b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_create_dns_endpoint_type_to_standard.py
index 58751957d828..1c4ef4ef1d58 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_create_dns_endpoint_type_to_standard.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_create_dns_endpoint_type_to_standard.py
@@ -6,8 +6,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import Any, IO, Union
-
 from azure.identity import DefaultAzureCredential
 
 from azure.mgmt.storage import StorageManagementClient
@@ -70,6 +68,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/StorageAccountCreateDnsEndpointTypeToStandard.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/StorageAccountCreateDnsEndpointTypeToStandard.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_create_enable_public_network_access.py b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_create_enable_public_network_access.py
index 70b64f3ea3bd..4b0558373565 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_create_enable_public_network_access.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_create_enable_public_network_access.py
@@ -6,8 +6,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import Any, IO, Union
-
 from azure.identity import DefaultAzureCredential
 
 from azure.mgmt.storage import StorageManagementClient
@@ -68,6 +66,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/StorageAccountCreateEnablePublicNetworkAccess.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/StorageAccountCreateEnablePublicNetworkAccess.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_create_object_replication_policy_on_destination.py b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_create_object_replication_policy_on_destination.py
index 51d5767bd151..43e26354b4b8 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_create_object_replication_policy_on_destination.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_create_object_replication_policy_on_destination.py
@@ -6,8 +6,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import Any, IO, Union
-
 from azure.identity import DefaultAzureCredential
 
 from azure.mgmt.storage import StorageManagementClient
@@ -39,6 +37,7 @@ def main():
         properties={
             "properties": {
                 "destinationAccount": "dst112",
+                "metrics": {"enabled": True},
                 "rules": [
                     {
                         "destinationContainer": "dcont139",
@@ -53,6 +52,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/StorageAccountCreateObjectReplicationPolicyOnDestination.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/StorageAccountCreateObjectReplicationPolicyOnDestination.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_create_object_replication_policy_on_source.py b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_create_object_replication_policy_on_source.py
index 2eb549054fde..d1020148e90d 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_create_object_replication_policy_on_source.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_create_object_replication_policy_on_source.py
@@ -6,8 +6,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import Any, IO, Union
-
 from azure.identity import DefaultAzureCredential
 
 from azure.mgmt.storage import StorageManagementClient
@@ -39,6 +37,7 @@ def main():
         properties={
             "properties": {
                 "destinationAccount": "dst112",
+                "metrics": {"enabled": True},
                 "rules": [
                     {
                         "destinationContainer": "dcont139",
@@ -54,6 +53,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/StorageAccountCreateObjectReplicationPolicyOnSource.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/StorageAccountCreateObjectReplicationPolicyOnSource.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_create_premium_block_blob_storage.py b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_create_premium_block_blob_storage.py
index 0c680d6c770b..1638b1394ae9 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_create_premium_block_blob_storage.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_create_premium_block_blob_storage.py
@@ -6,8 +6,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import Any, IO, Union
-
 from azure.identity import DefaultAzureCredential
 
 from azure.mgmt.storage import StorageManagementClient
@@ -57,6 +55,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/StorageAccountCreatePremiumBlockBlobStorage.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/StorageAccountCreatePremiumBlockBlobStorage.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_create_user_assigned_encryption_identity_with_cmk.py b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_create_user_assigned_encryption_identity_with_cmk.py
index c453021b7c99..68aab268d927 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_create_user_assigned_encryption_identity_with_cmk.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_create_user_assigned_encryption_identity_with_cmk.py
@@ -6,8 +6,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import Any, IO, Union
-
 from azure.identity import DefaultAzureCredential
 
 from azure.mgmt.storage import StorageManagementClient
@@ -67,6 +65,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/StorageAccountCreateUserAssignedEncryptionIdentityWithCMK.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/StorageAccountCreateUserAssignedEncryptionIdentityWithCMK.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_create_user_assigned_identity_with_federated_identity_client_id.py b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_create_user_assigned_identity_with_federated_identity_client_id.py
index 4876aa1aeab9..9c976426b87e 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_create_user_assigned_identity_with_federated_identity_client_id.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_create_user_assigned_identity_with_federated_identity_client_id.py
@@ -6,8 +6,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import Any, IO, Union
-
 from azure.identity import DefaultAzureCredential
 
 from azure.mgmt.storage import StorageManagementClient
@@ -68,6 +66,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/StorageAccountCreateUserAssignedIdentityWithFederatedIdentityClientId.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/StorageAccountCreateUserAssignedIdentityWithFederatedIdentityClientId.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_create_with_immutability_policy.py b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_create_with_immutability_policy.py
index 130ed2a64ea2..fe21a4a39311 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_create_with_immutability_policy.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_create_with_immutability_policy.py
@@ -6,8 +6,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import Any, IO, Union
-
 from azure.identity import DefaultAzureCredential
 
 from azure.mgmt.storage import StorageManagementClient
@@ -55,6 +53,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/StorageAccountCreateWithImmutabilityPolicy.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/StorageAccountCreateWithImmutabilityPolicy.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_delete.py b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_delete.py
index 4bf60089ef86..2635e16da7ae 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_delete.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_delete.py
@@ -36,6 +36,6 @@ def main():
     )
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/StorageAccountDelete.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/StorageAccountDelete.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_delete_blob_inventory_policy.py b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_delete_blob_inventory_policy.py
index 2b077e9e86e0..8dd29463a70d 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_delete_blob_inventory_policy.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_delete_blob_inventory_policy.py
@@ -6,15 +6,10 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import TYPE_CHECKING, Union
-
 from azure.identity import DefaultAzureCredential
 
 from azure.mgmt.storage import StorageManagementClient
 
-if TYPE_CHECKING:
-    # pylint: disable=unused-import,ungrouped-imports
-    from .. import models as _models
 """
 # PREREQUISITES
     pip install azure-identity
@@ -42,6 +37,6 @@ def main():
     )
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/StorageAccountDeleteBlobInventoryPolicy.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/StorageAccountDeleteBlobInventoryPolicy.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_delete_management_policy.py b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_delete_management_policy.py
index e306f1d46c44..38bad5152075 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_delete_management_policy.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_delete_management_policy.py
@@ -6,15 +6,10 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import TYPE_CHECKING, Union
-
 from azure.identity import DefaultAzureCredential
 
 from azure.mgmt.storage import StorageManagementClient
 
-if TYPE_CHECKING:
-    # pylint: disable=unused-import,ungrouped-imports
-    from .. import models as _models
 """
 # PREREQUISITES
     pip install azure-identity
@@ -42,6 +37,6 @@ def main():
     )
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/StorageAccountDeleteManagementPolicy.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/StorageAccountDeleteManagementPolicy.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_delete_object_replication_policy.py b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_delete_object_replication_policy.py
index 6c97fb695bb7..411679333417 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_delete_object_replication_policy.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_delete_object_replication_policy.py
@@ -37,6 +37,6 @@ def main():
     )
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/StorageAccountDeleteObjectReplicationPolicy.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/StorageAccountDeleteObjectReplicationPolicy.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_delete_private_endpoint_connection.py b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_delete_private_endpoint_connection.py
index a69178caf0a4..1bdd9ccc28b5 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_delete_private_endpoint_connection.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_delete_private_endpoint_connection.py
@@ -37,6 +37,6 @@ def main():
     )
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/StorageAccountDeletePrivateEndpointConnection.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/StorageAccountDeletePrivateEndpointConnection.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_enable_ad.py b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_enable_ad.py
index 4bef5a6a1b5d..55252d5124b3 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_enable_ad.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_enable_ad.py
@@ -6,8 +6,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import Any, IO, Union
-
 from azure.identity import DefaultAzureCredential
 
 from azure.mgmt.storage import StorageManagementClient
@@ -56,6 +54,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/StorageAccountEnableAD.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/StorageAccountEnableAD.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_enable_cmk.py b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_enable_cmk.py
index 514e37910926..ccadfb7db3cf 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_enable_cmk.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_enable_cmk.py
@@ -6,8 +6,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import Any, IO, Union
-
 from azure.identity import DefaultAzureCredential
 
 from azure.mgmt.storage import StorageManagementClient
@@ -55,6 +53,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/StorageAccountEnableCMK.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/StorageAccountEnableCMK.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_encryption_scope_list.py b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_encryption_scope_list.py
index 79d9cf443805..3e902cbbd008 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_encryption_scope_list.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_encryption_scope_list.py
@@ -38,6 +38,6 @@ def main():
         print(item)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/StorageAccountEncryptionScopeList.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/StorageAccountEncryptionScopeList.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_failover.py b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_failover.py
index bcc0d5733f24..8820b2c3f4fa 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_failover.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_failover.py
@@ -36,6 +36,6 @@ def main():
     ).result()
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/StorageAccountFailover.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/StorageAccountFailover.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_failover_planned.py b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_failover_planned.py
index b2a4313ed476..d1e91a1ea0d1 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_failover_planned.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_failover_planned.py
@@ -36,6 +36,6 @@ def main():
     ).result()
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/StorageAccountFailoverPlanned.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/StorageAccountFailoverPlanned.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_get_async_sku_conversion_status.py b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_get_async_sku_conversion_status.py
index 1775bbfa7e09..ec8ae5a3eedf 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_get_async_sku_conversion_status.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_get_async_sku_conversion_status.py
@@ -37,6 +37,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/StorageAccountGetAsyncSkuConversionStatus.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/StorageAccountGetAsyncSkuConversionStatus.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_get_blob_inventory_policy.py b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_get_blob_inventory_policy.py
index befb7d8d224a..5afd3104a50c 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_get_blob_inventory_policy.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_get_blob_inventory_policy.py
@@ -6,15 +6,10 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import TYPE_CHECKING, Union
-
 from azure.identity import DefaultAzureCredential
 
 from azure.mgmt.storage import StorageManagementClient
 
-if TYPE_CHECKING:
-    # pylint: disable=unused-import,ungrouped-imports
-    from .. import models as _models
 """
 # PREREQUISITES
     pip install azure-identity
@@ -43,6 +38,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/StorageAccountGetBlobInventoryPolicy.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/StorageAccountGetBlobInventoryPolicy.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_get_encryption_scope.py b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_get_encryption_scope.py
index 83cc5b2d8c54..31ac805e9ad7 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_get_encryption_scope.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_get_encryption_scope.py
@@ -38,6 +38,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/StorageAccountGetEncryptionScope.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/StorageAccountGetEncryptionScope.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_get_management_policy.py b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_get_management_policy.py
index ff04afa97bb8..030ce2787b9a 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_get_management_policy.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_get_management_policy.py
@@ -6,15 +6,10 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import TYPE_CHECKING, Union
-
 from azure.identity import DefaultAzureCredential
 
 from azure.mgmt.storage import StorageManagementClient
 
-if TYPE_CHECKING:
-    # pylint: disable=unused-import,ungrouped-imports
-    from .. import models as _models
 """
 # PREREQUISITES
     pip install azure-identity
@@ -43,6 +38,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/StorageAccountGetManagementPolicy.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/StorageAccountGetManagementPolicy.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_get_migration_failed.py b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_get_migration_failed.py
index 0d6c4b3c13ac..4ecf7e78f19d 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_get_migration_failed.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_get_migration_failed.py
@@ -6,15 +6,10 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import TYPE_CHECKING, Union
-
 from azure.identity import DefaultAzureCredential
 
 from azure.mgmt.storage import StorageManagementClient
 
-if TYPE_CHECKING:
-    # pylint: disable=unused-import,ungrouped-imports
-    from .. import models as _models
 """
 # PREREQUISITES
     pip install azure-identity
@@ -43,6 +38,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/StorageAccountGetMigrationFailed.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/StorageAccountGetMigrationFailed.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_get_migration_in_progress.py b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_get_migration_in_progress.py
index 8ad6d7c2258e..96a97f52ed23 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_get_migration_in_progress.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_get_migration_in_progress.py
@@ -6,15 +6,10 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import TYPE_CHECKING, Union
-
 from azure.identity import DefaultAzureCredential
 
 from azure.mgmt.storage import StorageManagementClient
 
-if TYPE_CHECKING:
-    # pylint: disable=unused-import,ungrouped-imports
-    from .. import models as _models
 """
 # PREREQUISITES
     pip install azure-identity
@@ -43,6 +38,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/StorageAccountGetMigrationInProgress.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/StorageAccountGetMigrationInProgress.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_get_object_replication_policy.py b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_get_object_replication_policy.py
index 524c7d62ce11..19ee1b90a73f 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_get_object_replication_policy.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_get_object_replication_policy.py
@@ -38,6 +38,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/StorageAccountGetObjectReplicationPolicy.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/StorageAccountGetObjectReplicationPolicy.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_get_private_endpoint_connection.py b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_get_private_endpoint_connection.py
index 9567ba8cff60..07dba2bfc318 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_get_private_endpoint_connection.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_get_private_endpoint_connection.py
@@ -38,6 +38,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/StorageAccountGetPrivateEndpointConnection.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/StorageAccountGetPrivateEndpointConnection.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_get_properties.py b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_get_properties.py
index 2a138b095f71..de0bcd922e66 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_get_properties.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_get_properties.py
@@ -37,6 +37,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/StorageAccountGetProperties.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/StorageAccountGetProperties.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_get_properties_cmk_enabled.py b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_get_properties_cmk_enabled.py
index df8e059c73d0..169e47315325 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_get_properties_cmk_enabled.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_get_properties_cmk_enabled.py
@@ -37,6 +37,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/StorageAccountGetPropertiesCMKEnabled.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/StorageAccountGetPropertiesCMKEnabled.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_get_properties_cmk_version_expiration_time.py b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_get_properties_cmk_version_expiration_time.py
index 502c8f725b1b..c711d9229191 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_get_properties_cmk_version_expiration_time.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_get_properties_cmk_version_expiration_time.py
@@ -37,6 +37,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/StorageAccountGetPropertiesCMKVersionExpirationTime.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/StorageAccountGetPropertiesCMKVersionExpirationTime.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_get_properties_geo_replication_statscan_failover_false.py b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_get_properties_geo_replication_statscan_failover_false.py
index eaafafca11e7..5514b6d3e14a 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_get_properties_geo_replication_statscan_failover_false.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_get_properties_geo_replication_statscan_failover_false.py
@@ -37,6 +37,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/StorageAccountGetPropertiesGeoReplicationStatscanFailoverFalse.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/StorageAccountGetPropertiesGeoReplicationStatscanFailoverFalse.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_get_properties_geo_replication_statscan_failover_true.py b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_get_properties_geo_replication_statscan_failover_true.py
index 45f63690a8cd..f439afe5dc86 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_get_properties_geo_replication_statscan_failover_true.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_get_properties_geo_replication_statscan_failover_true.py
@@ -37,6 +37,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/StorageAccountGetPropertiesGeoReplicationStatscanFailoverTrue.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/StorageAccountGetPropertiesGeoReplicationStatscanFailoverTrue.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_hierarchical_namespace_migration.py b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_hierarchical_namespace_migration.py
index f34d5c6ed359..7a34b0e22f33 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_hierarchical_namespace_migration.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_hierarchical_namespace_migration.py
@@ -37,6 +37,6 @@ def main():
     ).result()
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/StorageAccountHierarchicalNamespaceMigration.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/StorageAccountHierarchicalNamespaceMigration.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_list.py b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_list.py
index 1b41c7b2d35e..806f0b960e55 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_list.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_list.py
@@ -35,6 +35,6 @@ def main():
         print(item)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/StorageAccountList.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/StorageAccountList.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_list_account_sas.py b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_list_account_sas.py
index 5a27f8a1101f..9a36a5fc1dcf 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_list_account_sas.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_list_account_sas.py
@@ -6,8 +6,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import Any, IO, Union
-
 from azure.identity import DefaultAzureCredential
 
 from azure.mgmt.storage import StorageManagementClient
@@ -48,6 +46,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/StorageAccountListAccountSAS.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/StorageAccountListAccountSAS.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_list_blob_inventory_policy.py b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_list_blob_inventory_policy.py
index ee849ce0f080..95cc452a8ddc 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_list_blob_inventory_policy.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_list_blob_inventory_policy.py
@@ -38,6 +38,6 @@ def main():
         print(item)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/StorageAccountListBlobInventoryPolicy.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/StorageAccountListBlobInventoryPolicy.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_list_by_resource_group.py b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_list_by_resource_group.py
index 270e9314b75d..dc9dd906ce34 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_list_by_resource_group.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_list_by_resource_group.py
@@ -37,6 +37,6 @@ def main():
         print(item)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/StorageAccountListByResourceGroup.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/StorageAccountListByResourceGroup.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_list_keys.py b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_list_keys.py
index b8a0a2130ab7..38d63dc8a98a 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_list_keys.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_list_keys.py
@@ -37,6 +37,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/StorageAccountListKeys.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/StorageAccountListKeys.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_list_location_usage.py b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_list_location_usage.py
index 92db211ea846..114f765d9852 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_list_location_usage.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_list_location_usage.py
@@ -37,6 +37,6 @@ def main():
         print(item)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/StorageAccountListLocationUsage.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/StorageAccountListLocationUsage.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_list_object_replication_policies.py b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_list_object_replication_policies.py
index 3046ffcc93ec..26a25353d5fa 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_list_object_replication_policies.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_list_object_replication_policies.py
@@ -38,6 +38,6 @@ def main():
         print(item)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/StorageAccountListObjectReplicationPolicies.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/StorageAccountListObjectReplicationPolicies.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_list_private_endpoint_connections.py b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_list_private_endpoint_connections.py
index 36aac94511c3..cf6d871e0902 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_list_private_endpoint_connections.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_list_private_endpoint_connections.py
@@ -38,6 +38,6 @@ def main():
         print(item)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/StorageAccountListPrivateEndpointConnections.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/StorageAccountListPrivateEndpointConnections.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_list_private_link_resources.py b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_list_private_link_resources.py
index 599c76d24135..863d18a72c37 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_list_private_link_resources.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_list_private_link_resources.py
@@ -37,6 +37,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/StorageAccountListPrivateLinkResources.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/StorageAccountListPrivateLinkResources.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_list_service_sas.py b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_list_service_sas.py
index 34485cb1f9d6..fe2114447cfe 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_list_service_sas.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_list_service_sas.py
@@ -6,8 +6,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import Any, IO, Union
-
 from azure.identity import DefaultAzureCredential
 
 from azure.mgmt.storage import StorageManagementClient
@@ -45,6 +43,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/StorageAccountListServiceSAS.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/StorageAccountListServiceSAS.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_patch_encryption_scope.py b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_patch_encryption_scope.py
index ede89f35a777..4f0003e182da 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_patch_encryption_scope.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_patch_encryption_scope.py
@@ -6,8 +6,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import Any, IO, Union
-
 from azure.identity import DefaultAzureCredential
 
 from azure.mgmt.storage import StorageManagementClient
@@ -46,6 +44,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/StorageAccountPatchEncryptionScope.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/StorageAccountPatchEncryptionScope.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_post_migration.py b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_post_migration.py
index b820eb5c2d49..7334a48cec02 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_post_migration.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_post_migration.py
@@ -6,8 +6,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import Any, IO, Union
-
 from azure.identity import DefaultAzureCredential
 
 from azure.mgmt.storage import StorageManagementClient
@@ -39,6 +37,6 @@ def main():
     ).result()
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/StorageAccountPostMigration.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/StorageAccountPostMigration.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_put_encryption_scope_with_infrastructure_encryption.py b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_put_encryption_scope_with_infrastructure_encryption.py
index ef5a5a35c5ba..77ca92c7ad6b 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_put_encryption_scope_with_infrastructure_encryption.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_put_encryption_scope_with_infrastructure_encryption.py
@@ -6,8 +6,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import Any, IO, Union
-
 from azure.identity import DefaultAzureCredential
 
 from azure.mgmt.storage import StorageManagementClient
@@ -41,6 +39,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/StorageAccountPutEncryptionScopeWithInfrastructureEncryption.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/StorageAccountPutEncryptionScopeWithInfrastructureEncryption.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_put_private_endpoint_connection.py b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_put_private_endpoint_connection.py
index df5057db6530..647702c4594f 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_put_private_endpoint_connection.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_put_private_endpoint_connection.py
@@ -6,8 +6,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import Any, IO, Union
-
 from azure.identity import DefaultAzureCredential
 
 from azure.mgmt.storage import StorageManagementClient
@@ -43,6 +41,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/StorageAccountPutPrivateEndpointConnection.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/StorageAccountPutPrivateEndpointConnection.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_regenerate_kerb_key.py b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_regenerate_kerb_key.py
index b1816bc28c5e..3f7c743ebef8 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_regenerate_kerb_key.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_regenerate_kerb_key.py
@@ -6,8 +6,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import Any, IO, Union
-
 from azure.identity import DefaultAzureCredential
 
 from azure.mgmt.storage import StorageManagementClient
@@ -40,6 +38,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/StorageAccountRegenerateKerbKey.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/StorageAccountRegenerateKerbKey.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_regenerate_key.py b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_regenerate_key.py
index 0f374fcc8f70..a07da3c21f4a 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_regenerate_key.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_regenerate_key.py
@@ -6,8 +6,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import Any, IO, Union
-
 from azure.identity import DefaultAzureCredential
 
 from azure.mgmt.storage import StorageManagementClient
@@ -40,6 +38,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/StorageAccountRegenerateKey.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/StorageAccountRegenerateKey.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_revoke_user_delegation_keys.py b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_revoke_user_delegation_keys.py
index b2294cdf435e..175cbb236c32 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_revoke_user_delegation_keys.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_revoke_user_delegation_keys.py
@@ -36,6 +36,6 @@ def main():
     )
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/StorageAccountRevokeUserDelegationKeys.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/StorageAccountRevokeUserDelegationKeys.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_set_blob_inventory_policy.py b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_set_blob_inventory_policy.py
index dd010a1365f5..8b2fa9b6cabd 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_set_blob_inventory_policy.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_set_blob_inventory_policy.py
@@ -6,15 +6,10 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import Any, IO, TYPE_CHECKING, Union
-
 from azure.identity import DefaultAzureCredential
 
 from azure.mgmt.storage import StorageManagementClient
 
-if TYPE_CHECKING:
-    # pylint: disable=unused-import,ungrouped-imports
-    from .. import models as _models
 """
 # PREREQUISITES
     pip install azure-identity
@@ -105,6 +100,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/StorageAccountSetBlobInventoryPolicy.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/StorageAccountSetBlobInventoryPolicy.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_set_blob_inventory_policy_include_delete_and_new_schema_for_hns_account.py b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_set_blob_inventory_policy_include_delete_and_new_schema_for_hns_account.py
index d0fcfb0dc606..ebb9b962411b 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_set_blob_inventory_policy_include_delete_and_new_schema_for_hns_account.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_set_blob_inventory_policy_include_delete_and_new_schema_for_hns_account.py
@@ -6,15 +6,10 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import Any, IO, TYPE_CHECKING, Union
-
 from azure.identity import DefaultAzureCredential
 
 from azure.mgmt.storage import StorageManagementClient
 
-if TYPE_CHECKING:
-    # pylint: disable=unused-import,ungrouped-imports
-    from .. import models as _models
 """
 # PREREQUISITES
     pip install azure-identity
@@ -123,6 +118,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/StorageAccountSetBlobInventoryPolicyIncludeDeleteAndNewSchemaForHnsAccount.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/StorageAccountSetBlobInventoryPolicyIncludeDeleteAndNewSchemaForHnsAccount.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_set_blob_inventory_policy_include_delete_and_new_schema_for_non_hns_account.py b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_set_blob_inventory_policy_include_delete_and_new_schema_for_non_hns_account.py
index 02ea31966ee7..fab5bdf70f60 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_set_blob_inventory_policy_include_delete_and_new_schema_for_non_hns_account.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_set_blob_inventory_policy_include_delete_and_new_schema_for_non_hns_account.py
@@ -6,15 +6,10 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import Any, IO, TYPE_CHECKING, Union
-
 from azure.identity import DefaultAzureCredential
 
 from azure.mgmt.storage import StorageManagementClient
 
-if TYPE_CHECKING:
-    # pylint: disable=unused-import,ungrouped-imports
-    from .. import models as _models
 """
 # PREREQUISITES
     pip install azure-identity
@@ -122,6 +117,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/StorageAccountSetBlobInventoryPolicyIncludeDeleteAndNewSchemaForNonHnsAccount.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/StorageAccountSetBlobInventoryPolicyIncludeDeleteAndNewSchemaForNonHnsAccount.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_set_management_policy.py b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_set_management_policy.py
index 02a461617cb7..7bdeee709651 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_set_management_policy.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_set_management_policy.py
@@ -6,15 +6,10 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import Any, IO, TYPE_CHECKING, Union
-
 from azure.identity import DefaultAzureCredential
 
 from azure.mgmt.storage import StorageManagementClient
 
-if TYPE_CHECKING:
-    # pylint: disable=unused-import,ungrouped-imports
-    from .. import models as _models
 """
 # PREREQUISITES
     pip install azure-identity
@@ -89,6 +84,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/StorageAccountSetManagementPolicy.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/StorageAccountSetManagementPolicy.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_set_management_policy_base_blob_days_after_creation_actions.py b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_set_management_policy_base_blob_days_after_creation_actions.py
index 801436fa4c54..4845112231c1 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_set_management_policy_base_blob_days_after_creation_actions.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_set_management_policy_base_blob_days_after_creation_actions.py
@@ -6,15 +6,10 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import Any, IO, TYPE_CHECKING, Union
-
 from azure.identity import DefaultAzureCredential
 
 from azure.mgmt.storage import StorageManagementClient
 
-if TYPE_CHECKING:
-    # pylint: disable=unused-import,ungrouped-imports
-    from .. import models as _models
 """
 # PREREQUISITES
     pip install azure-identity
@@ -66,6 +61,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/StorageAccountSetManagementPolicy_BaseBlobDaysAfterCreationActions.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/StorageAccountSetManagementPolicy_BaseBlobDaysAfterCreationActions.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_set_management_policy_cold_tier_actions.py b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_set_management_policy_cold_tier_actions.py
index deca4f8f4a14..9f347ba724e5 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_set_management_policy_cold_tier_actions.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_set_management_policy_cold_tier_actions.py
@@ -6,15 +6,10 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import Any, IO, TYPE_CHECKING, Union
-
 from azure.identity import DefaultAzureCredential
 
 from azure.mgmt.storage import StorageManagementClient
 
-if TYPE_CHECKING:
-    # pylint: disable=unused-import,ungrouped-imports
-    from .. import models as _models
 """
 # PREREQUISITES
     pip install azure-identity
@@ -75,6 +70,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/StorageAccountSetManagementPolicyColdTierActions.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/StorageAccountSetManagementPolicyColdTierActions.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_set_management_policy_for_block_and_append_blobs.py b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_set_management_policy_for_block_and_append_blobs.py
index 06c066ca5611..3da4609a60ce 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_set_management_policy_for_block_and_append_blobs.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_set_management_policy_for_block_and_append_blobs.py
@@ -6,15 +6,10 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import Any, IO, TYPE_CHECKING, Union
-
 from azure.identity import DefaultAzureCredential
 
 from azure.mgmt.storage import StorageManagementClient
 
-if TYPE_CHECKING:
-    # pylint: disable=unused-import,ungrouped-imports
-    from .. import models as _models
 """
 # PREREQUISITES
     pip install azure-identity
@@ -67,6 +62,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/StorageAccountSetManagementPolicyForBlockAndAppendBlobs.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/StorageAccountSetManagementPolicyForBlockAndAppendBlobs.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_set_management_policy_hot_tier_actions.py b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_set_management_policy_hot_tier_actions.py
index 44e6bf17bbff..8496ffbcfe29 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_set_management_policy_hot_tier_actions.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_set_management_policy_hot_tier_actions.py
@@ -6,15 +6,10 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import Any, IO, TYPE_CHECKING, Union
-
 from azure.identity import DefaultAzureCredential
 
 from azure.mgmt.storage import StorageManagementClient
 
-if TYPE_CHECKING:
-    # pylint: disable=unused-import,ungrouped-imports
-    from .. import models as _models
 """
 # PREREQUISITES
     pip install azure-identity
@@ -64,6 +59,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/StorageAccountSetManagementPolicyHotTierActions.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/StorageAccountSetManagementPolicyHotTierActions.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_set_management_policy_last_access_time_based_blob_actions.py b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_set_management_policy_last_access_time_based_blob_actions.py
index 6b23f89588de..94b8387f3943 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_set_management_policy_last_access_time_based_blob_actions.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_set_management_policy_last_access_time_based_blob_actions.py
@@ -6,15 +6,10 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import Any, IO, TYPE_CHECKING, Union
-
 from azure.identity import DefaultAzureCredential
 
 from azure.mgmt.storage import StorageManagementClient
 
-if TYPE_CHECKING:
-    # pylint: disable=unused-import,ungrouped-imports
-    from .. import models as _models
 """
 # PREREQUISITES
     pip install azure-identity
@@ -68,6 +63,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/StorageAccountSetManagementPolicy_LastAccessTimeBasedBlobActions.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/StorageAccountSetManagementPolicy_LastAccessTimeBasedBlobActions.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_set_management_policy_last_tier_change_time_actions.py b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_set_management_policy_last_tier_change_time_actions.py
index d178b4fa366a..59f7f2b93fdb 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_set_management_policy_last_tier_change_time_actions.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_set_management_policy_last_tier_change_time_actions.py
@@ -6,15 +6,10 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import Any, IO, TYPE_CHECKING, Union
-
 from azure.identity import DefaultAzureCredential
 
 from azure.mgmt.storage import StorageManagementClient
 
-if TYPE_CHECKING:
-    # pylint: disable=unused-import,ungrouped-imports
-    from .. import models as _models
 """
 # PREREQUISITES
     pip install azure-identity
@@ -81,6 +76,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/StorageAccountSetManagementPolicy_LastTierChangeTimeActions.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/StorageAccountSetManagementPolicy_LastTierChangeTimeActions.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_set_management_policy_with_snapshot_and_version.py b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_set_management_policy_with_snapshot_and_version.py
index c290abc64604..b3ec41c76a29 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_set_management_policy_with_snapshot_and_version.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_set_management_policy_with_snapshot_and_version.py
@@ -6,15 +6,10 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import Any, IO, TYPE_CHECKING, Union
-
 from azure.identity import DefaultAzureCredential
 
 from azure.mgmt.storage import StorageManagementClient
 
-if TYPE_CHECKING:
-    # pylint: disable=unused-import,ungrouped-imports
-    from .. import models as _models
 """
 # PREREQUISITES
     pip install azure-identity
@@ -76,6 +71,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/StorageAccountSetManagementPolicyWithSnapshotAndVersion.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/StorageAccountSetManagementPolicyWithSnapshotAndVersion.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_update.py b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_update.py
index 4ac7e096d66f..8dd8159850a4 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_update.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_update.py
@@ -6,8 +6,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import Any, IO, Union
-
 from azure.identity import DefaultAzureCredential
 
 from azure.mgmt.storage import StorageManagementClient
@@ -73,6 +71,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/StorageAccountUpdate.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/StorageAccountUpdate.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_update_allowed_copy_scope_to_aad.py b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_update_allowed_copy_scope_to_aad.py
index 6ed234279cfb..144e0e71abe4 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_update_allowed_copy_scope_to_aad.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_update_allowed_copy_scope_to_aad.py
@@ -6,8 +6,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import Any, IO, Union
-
 from azure.identity import DefaultAzureCredential
 
 from azure.mgmt.storage import StorageManagementClient
@@ -70,6 +68,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/StorageAccountUpdateAllowedCopyScopeToAAD.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/StorageAccountUpdateAllowedCopyScopeToAAD.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_update_disable_public_network_access.py b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_update_disable_public_network_access.py
index ba13c9837c91..05156fc1bb6c 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_update_disable_public_network_access.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_update_disable_public_network_access.py
@@ -6,8 +6,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import Any, IO, Union
-
 from azure.identity import DefaultAzureCredential
 
 from azure.mgmt.storage import StorageManagementClient
@@ -70,6 +68,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/StorageAccountUpdateDisablePublicNetworkAccess.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/StorageAccountUpdateDisablePublicNetworkAccess.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_update_object_replication_policy_on_destination.py b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_update_object_replication_policy_on_destination.py
index 8e50f8cde4c6..3acbd45eaa41 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_update_object_replication_policy_on_destination.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_update_object_replication_policy_on_destination.py
@@ -6,8 +6,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import Any, IO, Union
-
 from azure.identity import DefaultAzureCredential
 
 from azure.mgmt.storage import StorageManagementClient
@@ -39,6 +37,7 @@ def main():
         properties={
             "properties": {
                 "destinationAccount": "dst112",
+                "metrics": {"enabled": True},
                 "rules": [
                     {
                         "destinationContainer": "dcont139",
@@ -55,6 +54,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/StorageAccountUpdateObjectReplicationPolicyOnDestination.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/StorageAccountUpdateObjectReplicationPolicyOnDestination.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_update_object_replication_policy_on_source.py b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_update_object_replication_policy_on_source.py
index 3de4bcfaabb2..317919a850cf 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_update_object_replication_policy_on_source.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_update_object_replication_policy_on_source.py
@@ -6,8 +6,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import Any, IO, Union
-
 from azure.identity import DefaultAzureCredential
 
 from azure.mgmt.storage import StorageManagementClient
@@ -39,6 +37,7 @@ def main():
         properties={
             "properties": {
                 "destinationAccount": "dst112",
+                "metrics": {"enabled": True},
                 "rules": [
                     {
                         "destinationContainer": "dcont139",
@@ -59,6 +58,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/StorageAccountUpdateObjectReplicationPolicyOnSource.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/StorageAccountUpdateObjectReplicationPolicyOnSource.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_update_user_assigned_encryption_identity_with_cmk.py b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_update_user_assigned_encryption_identity_with_cmk.py
index 7843fc224281..7efd80001d49 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_update_user_assigned_encryption_identity_with_cmk.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_update_user_assigned_encryption_identity_with_cmk.py
@@ -6,8 +6,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import Any, IO, Union
-
 from azure.identity import DefaultAzureCredential
 
 from azure.mgmt.storage import StorageManagementClient
@@ -66,6 +64,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/StorageAccountUpdateUserAssignedEncryptionIdentityWithCMK.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/StorageAccountUpdateUserAssignedEncryptionIdentityWithCMK.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_update_user_assigned_identity_with_federated_identity_client_id.py b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_update_user_assigned_identity_with_federated_identity_client_id.py
index 69422b514208..bc1fdb679deb 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_update_user_assigned_identity_with_federated_identity_client_id.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_update_user_assigned_identity_with_federated_identity_client_id.py
@@ -6,8 +6,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import Any, IO, Union
-
 from azure.identity import DefaultAzureCredential
 
 from azure.mgmt.storage import StorageManagementClient
@@ -67,6 +65,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/StorageAccountUpdateUserAssignedIdentityWithFederatedIdentityClientId.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/StorageAccountUpdateUserAssignedIdentityWithFederatedIdentityClientId.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_update_with_immutability_policy.py b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_update_with_immutability_policy.py
index d7a40480b31a..08d00b49244d 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_update_with_immutability_policy.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/storage_account_update_with_immutability_policy.py
@@ -6,8 +6,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import Any, IO, Union
-
 from azure.identity import DefaultAzureCredential
 
 from azure.mgmt.storage import StorageManagementClient
@@ -51,6 +49,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/StorageAccountUpdateWithImmutabilityPolicy.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/StorageAccountUpdateWithImmutabilityPolicy.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/storage_task_assignments_crud/delete_storage_task_assignment.py b/sdk/storage/azure-mgmt-storage/generated_samples/storage_task_assignments_crud/delete_storage_task_assignment.py
index 8582d8da9440..0e7fb70f9fe8 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/storage_task_assignments_crud/delete_storage_task_assignment.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/storage_task_assignments_crud/delete_storage_task_assignment.py
@@ -37,6 +37,6 @@ def main():
     ).result()
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/storageTaskAssignmentsCrud/DeleteStorageTaskAssignment.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/storageTaskAssignmentsCrud/DeleteStorageTaskAssignment.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/storage_task_assignments_crud/get_storage_task_assignment.py b/sdk/storage/azure-mgmt-storage/generated_samples/storage_task_assignments_crud/get_storage_task_assignment.py
index 9ebb2e93f17a..b98f927ee36b 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/storage_task_assignments_crud/get_storage_task_assignment.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/storage_task_assignments_crud/get_storage_task_assignment.py
@@ -38,6 +38,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/storageTaskAssignmentsCrud/GetStorageTaskAssignment.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/storageTaskAssignmentsCrud/GetStorageTaskAssignment.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/storage_task_assignments_crud/patch_storage_task_assignment.py b/sdk/storage/azure-mgmt-storage/generated_samples/storage_task_assignments_crud/patch_storage_task_assignment.py
index 64f9965138c2..7a276b10d6e1 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/storage_task_assignments_crud/patch_storage_task_assignment.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/storage_task_assignments_crud/patch_storage_task_assignment.py
@@ -6,8 +6,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import Any, IO, Union
-
 from azure.identity import DefaultAzureCredential
 
 from azure.mgmt.storage import StorageManagementClient
@@ -51,6 +49,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/storageTaskAssignmentsCrud/PatchStorageTaskAssignment.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/storageTaskAssignmentsCrud/PatchStorageTaskAssignment.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/storage_task_assignments_crud/put_storage_task_assignment.py b/sdk/storage/azure-mgmt-storage/generated_samples/storage_task_assignments_crud/put_storage_task_assignment.py
index 44524c64b5f2..bdfe12219525 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/storage_task_assignments_crud/put_storage_task_assignment.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/storage_task_assignments_crud/put_storage_task_assignment.py
@@ -6,8 +6,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import Any, IO, Union
-
 from azure.identity import DefaultAzureCredential
 
 from azure.mgmt.storage import StorageManagementClient
@@ -52,6 +50,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/storageTaskAssignmentsCrud/PutStorageTaskAssignment.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/storageTaskAssignmentsCrud/PutStorageTaskAssignment.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/storage_task_assignments_crud/put_storage_task_assignment_required_properties.py b/sdk/storage/azure-mgmt-storage/generated_samples/storage_task_assignments_crud/put_storage_task_assignment_required_properties.py
index f687d4872a77..d2d2661f845e 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/storage_task_assignments_crud/put_storage_task_assignment_required_properties.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/storage_task_assignments_crud/put_storage_task_assignment_required_properties.py
@@ -6,8 +6,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import Any, IO, Union
-
 from azure.identity import DefaultAzureCredential
 
 from azure.mgmt.storage import StorageManagementClient
@@ -51,6 +49,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/storageTaskAssignmentsCrud/PutStorageTaskAssignmentRequiredProperties.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/storageTaskAssignmentsCrud/PutStorageTaskAssignmentRequiredProperties.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/storage_task_assignments_list/list_storage_task_assignment_instances_report_summary.py b/sdk/storage/azure-mgmt-storage/generated_samples/storage_task_assignments_list/list_storage_task_assignment_instances_report_summary.py
index c8aa32b58dec..bc1e7392ffd2 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/storage_task_assignments_list/list_storage_task_assignment_instances_report_summary.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/storage_task_assignments_list/list_storage_task_assignment_instances_report_summary.py
@@ -39,6 +39,6 @@ def main():
         print(item)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/storageTaskAssignmentsList/ListStorageTaskAssignmentInstancesReportSummary.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/storageTaskAssignmentsList/ListStorageTaskAssignmentInstancesReportSummary.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/storage_task_assignments_list/list_storage_task_assignments_for_account.py b/sdk/storage/azure-mgmt-storage/generated_samples/storage_task_assignments_list/list_storage_task_assignments_for_account.py
index a51ec649b012..f21cc3a172dc 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/storage_task_assignments_list/list_storage_task_assignments_for_account.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/storage_task_assignments_list/list_storage_task_assignments_for_account.py
@@ -38,6 +38,6 @@ def main():
         print(item)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/storageTaskAssignmentsList/ListStorageTaskAssignmentsForAccount.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/storageTaskAssignmentsList/ListStorageTaskAssignmentsForAccount.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/storage_task_assignments_list/list_storage_task_assignments_instances_report_summary.py b/sdk/storage/azure-mgmt-storage/generated_samples/storage_task_assignments_list/list_storage_task_assignments_instances_report_summary.py
index 9a7284368335..3e8c64496e27 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/storage_task_assignments_list/list_storage_task_assignments_instances_report_summary.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/storage_task_assignments_list/list_storage_task_assignments_instances_report_summary.py
@@ -38,6 +38,6 @@ def main():
         print(item)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/storageTaskAssignmentsList/ListStorageTaskAssignmentsInstancesReportSummary.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/storageTaskAssignmentsList/ListStorageTaskAssignmentsInstancesReportSummary.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/table_operation_delete.py b/sdk/storage/azure-mgmt-storage/generated_samples/table_operation_delete.py
index 20f391e482ed..5906302c2e1f 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/table_operation_delete.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/table_operation_delete.py
@@ -37,6 +37,6 @@ def main():
     )
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/TableOperationDelete.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/TableOperationDelete.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/table_operation_get.py b/sdk/storage/azure-mgmt-storage/generated_samples/table_operation_get.py
index e9cc81e2c8b9..348c33d533de 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/table_operation_get.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/table_operation_get.py
@@ -38,6 +38,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/TableOperationGet.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/TableOperationGet.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/table_operation_list.py b/sdk/storage/azure-mgmt-storage/generated_samples/table_operation_list.py
index b8596e1e79cb..baf81313e821 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/table_operation_list.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/table_operation_list.py
@@ -38,6 +38,6 @@ def main():
         print(item)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/TableOperationList.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/TableOperationList.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/table_operation_patch.py b/sdk/storage/azure-mgmt-storage/generated_samples/table_operation_patch.py
index bfeb6c21821b..fbc0196a0f0f 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/table_operation_patch.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/table_operation_patch.py
@@ -38,6 +38,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/TableOperationPatch.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/TableOperationPatch.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/table_operation_put.py b/sdk/storage/azure-mgmt-storage/generated_samples/table_operation_put.py
index 1e311f5573ac..4087c7673373 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/table_operation_put.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/table_operation_put.py
@@ -38,6 +38,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/TableOperationPut.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/TableOperationPut.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/table_operation_put_or_patch_acls.py b/sdk/storage/azure-mgmt-storage/generated_samples/table_operation_put_or_patch_acls.py
index d842ace68060..c9055224d2fe 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/table_operation_put_or_patch_acls.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/table_operation_put_or_patch_acls.py
@@ -30,7 +30,7 @@ def main():
         subscription_id="{subscription-id}",
     )
 
-    response = client.table.create(
+    response = client.table.update(
         resource_group_name="res3376",
         account_name="sto328",
         table_name="table6185",
@@ -38,6 +38,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/TableOperationPutOrPatchAcls.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/TableOperationPutOrPatchAcls.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/table_services_get.py b/sdk/storage/azure-mgmt-storage/generated_samples/table_services_get.py
index e7042624a211..a483b360c535 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/table_services_get.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/table_services_get.py
@@ -37,6 +37,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/TableServicesGet.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/TableServicesGet.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/table_services_list.py b/sdk/storage/azure-mgmt-storage/generated_samples/table_services_list.py
index b45d936c56b4..db87eb3768c7 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/table_services_list.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/table_services_list.py
@@ -37,6 +37,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/TableServicesList.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/TableServicesList.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_samples/table_services_put.py b/sdk/storage/azure-mgmt-storage/generated_samples/table_services_put.py
index 86604df737ad..5c735bdda100 100644
--- a/sdk/storage/azure-mgmt-storage/generated_samples/table_services_put.py
+++ b/sdk/storage/azure-mgmt-storage/generated_samples/table_services_put.py
@@ -6,8 +6,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import Any, IO, Union
-
 from azure.identity import DefaultAzureCredential
 
 from azure.mgmt.storage import StorageManagementClient
@@ -68,6 +66,6 @@ def main():
     print(response)
 
 
-# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2023-05-01/examples/TableServicesPut.json
+# x-ms-original-file: specification/storage/resource-manager/Microsoft.Storage/stable/2024-01-01/examples/TableServicesPut.json
 if __name__ == "__main__":
     main()
diff --git a/sdk/storage/azure-mgmt-storage/generated_tests/conftest.py b/sdk/storage/azure-mgmt-storage/generated_tests/conftest.py
new file mode 100644
index 000000000000..167edda55fba
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/generated_tests/conftest.py
@@ -0,0 +1,35 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+import os
+import pytest
+from dotenv import load_dotenv
+from devtools_testutils import (
+    test_proxy,
+    add_general_regex_sanitizer,
+    add_body_key_sanitizer,
+    add_header_regex_sanitizer,
+)
+
+load_dotenv()
+
+
+# For security, please avoid record sensitive identity information in recordings
+@pytest.fixture(scope="session", autouse=True)
+def add_sanitizers(test_proxy):
+    storagemanagement_subscription_id = os.environ.get("AZURE_SUBSCRIPTION_ID", "00000000-0000-0000-0000-000000000000")
+    storagemanagement_tenant_id = os.environ.get("AZURE_TENANT_ID", "00000000-0000-0000-0000-000000000000")
+    storagemanagement_client_id = os.environ.get("AZURE_CLIENT_ID", "00000000-0000-0000-0000-000000000000")
+    storagemanagement_client_secret = os.environ.get("AZURE_CLIENT_SECRET", "00000000-0000-0000-0000-000000000000")
+    add_general_regex_sanitizer(regex=storagemanagement_subscription_id, value="00000000-0000-0000-0000-000000000000")
+    add_general_regex_sanitizer(regex=storagemanagement_tenant_id, value="00000000-0000-0000-0000-000000000000")
+    add_general_regex_sanitizer(regex=storagemanagement_client_id, value="00000000-0000-0000-0000-000000000000")
+    add_general_regex_sanitizer(regex=storagemanagement_client_secret, value="00000000-0000-0000-0000-000000000000")
+
+    add_header_regex_sanitizer(key="Set-Cookie", value="[set-cookie;]")
+    add_header_regex_sanitizer(key="Cookie", value="cookie;")
+    add_body_key_sanitizer(json_path="$..access_token", value="access_token")
diff --git a/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_blob_containers_operations.py b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_blob_containers_operations.py
new file mode 100644
index 000000000000..353314ba875a
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_blob_containers_operations.py
@@ -0,0 +1,332 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+import pytest
+from azure.mgmt.storage import StorageManagementClient
+
+from devtools_testutils import AzureMgmtRecordedTestCase, RandomNameResourceGroupPreparer, recorded_by_proxy
+
+AZURE_LOCATION = "eastus"
+
+
+@pytest.mark.skip("you may need to update the auto-generated test case before run it")
+class TestStorageManagementBlobContainersOperations(AzureMgmtRecordedTestCase):
+    def setup_method(self, method):
+        self.client = self.create_mgmt_client(StorageManagementClient)
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_blob_containers_list(self, resource_group):
+        response = self.client.blob_containers.list(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            api_version="2024-01-01",
+        )
+        result = [r for r in response]
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_blob_containers_create(self, resource_group):
+        response = self.client.blob_containers.create(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            container_name="str",
+            blob_container={
+                "defaultEncryptionScope": "str",
+                "deleted": bool,
+                "deletedTime": "2020-02-20 00:00:00",
+                "denyEncryptionScopeOverride": bool,
+                "enableNfsV3AllSquash": bool,
+                "enableNfsV3RootSquash": bool,
+                "etag": "str",
+                "hasImmutabilityPolicy": bool,
+                "hasLegalHold": bool,
+                "id": "str",
+                "immutabilityPolicy": {
+                    "allowProtectedAppendWrites": bool,
+                    "allowProtectedAppendWritesAll": bool,
+                    "etag": "str",
+                    "immutabilityPeriodSinceCreationInDays": 0,
+                    "state": "str",
+                    "updateHistory": [
+                        {
+                            "allowProtectedAppendWrites": bool,
+                            "allowProtectedAppendWritesAll": bool,
+                            "immutabilityPeriodSinceCreationInDays": 0,
+                            "objectIdentifier": "str",
+                            "tenantId": "str",
+                            "timestamp": "2020-02-20 00:00:00",
+                            "update": "str",
+                            "upn": "str",
+                        }
+                    ],
+                },
+                "immutableStorageWithVersioning": {
+                    "enabled": bool,
+                    "migrationState": "str",
+                    "timeStamp": "2020-02-20 00:00:00",
+                },
+                "lastModifiedTime": "2020-02-20 00:00:00",
+                "leaseDuration": "str",
+                "leaseState": "str",
+                "leaseStatus": "str",
+                "legalHold": {
+                    "hasLegalHold": bool,
+                    "protectedAppendWritesHistory": {
+                        "allowProtectedAppendWritesAll": bool,
+                        "timestamp": "2020-02-20 00:00:00",
+                    },
+                    "tags": [
+                        {
+                            "objectIdentifier": "str",
+                            "tag": "str",
+                            "tenantId": "str",
+                            "timestamp": "2020-02-20 00:00:00",
+                            "upn": "str",
+                        }
+                    ],
+                },
+                "metadata": {"str": "str"},
+                "name": "str",
+                "publicAccess": "str",
+                "remainingRetentionDays": 0,
+                "type": "str",
+                "version": "str",
+            },
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_blob_containers_update(self, resource_group):
+        response = self.client.blob_containers.update(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            container_name="str",
+            blob_container={
+                "defaultEncryptionScope": "str",
+                "deleted": bool,
+                "deletedTime": "2020-02-20 00:00:00",
+                "denyEncryptionScopeOverride": bool,
+                "enableNfsV3AllSquash": bool,
+                "enableNfsV3RootSquash": bool,
+                "etag": "str",
+                "hasImmutabilityPolicy": bool,
+                "hasLegalHold": bool,
+                "id": "str",
+                "immutabilityPolicy": {
+                    "allowProtectedAppendWrites": bool,
+                    "allowProtectedAppendWritesAll": bool,
+                    "etag": "str",
+                    "immutabilityPeriodSinceCreationInDays": 0,
+                    "state": "str",
+                    "updateHistory": [
+                        {
+                            "allowProtectedAppendWrites": bool,
+                            "allowProtectedAppendWritesAll": bool,
+                            "immutabilityPeriodSinceCreationInDays": 0,
+                            "objectIdentifier": "str",
+                            "tenantId": "str",
+                            "timestamp": "2020-02-20 00:00:00",
+                            "update": "str",
+                            "upn": "str",
+                        }
+                    ],
+                },
+                "immutableStorageWithVersioning": {
+                    "enabled": bool,
+                    "migrationState": "str",
+                    "timeStamp": "2020-02-20 00:00:00",
+                },
+                "lastModifiedTime": "2020-02-20 00:00:00",
+                "leaseDuration": "str",
+                "leaseState": "str",
+                "leaseStatus": "str",
+                "legalHold": {
+                    "hasLegalHold": bool,
+                    "protectedAppendWritesHistory": {
+                        "allowProtectedAppendWritesAll": bool,
+                        "timestamp": "2020-02-20 00:00:00",
+                    },
+                    "tags": [
+                        {
+                            "objectIdentifier": "str",
+                            "tag": "str",
+                            "tenantId": "str",
+                            "timestamp": "2020-02-20 00:00:00",
+                            "upn": "str",
+                        }
+                    ],
+                },
+                "metadata": {"str": "str"},
+                "name": "str",
+                "publicAccess": "str",
+                "remainingRetentionDays": 0,
+                "type": "str",
+                "version": "str",
+            },
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_blob_containers_get(self, resource_group):
+        response = self.client.blob_containers.get(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            container_name="str",
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_blob_containers_delete(self, resource_group):
+        response = self.client.blob_containers.delete(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            container_name="str",
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_blob_containers_set_legal_hold(self, resource_group):
+        response = self.client.blob_containers.set_legal_hold(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            container_name="str",
+            legal_hold={"tags": ["str"], "allowProtectedAppendWritesAll": bool, "hasLegalHold": bool},
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_blob_containers_clear_legal_hold(self, resource_group):
+        response = self.client.blob_containers.clear_legal_hold(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            container_name="str",
+            legal_hold={"tags": ["str"], "allowProtectedAppendWritesAll": bool, "hasLegalHold": bool},
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_blob_containers_create_or_update_immutability_policy(self, resource_group):
+        response = self.client.blob_containers.create_or_update_immutability_policy(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            container_name="str",
+            immutability_policy_name="default",
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_blob_containers_get_immutability_policy(self, resource_group):
+        response = self.client.blob_containers.get_immutability_policy(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            container_name="str",
+            immutability_policy_name="default",
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_blob_containers_delete_immutability_policy(self, resource_group):
+        response = self.client.blob_containers.delete_immutability_policy(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            container_name="str",
+            if_match="str",
+            immutability_policy_name="default",
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_blob_containers_lock_immutability_policy(self, resource_group):
+        response = self.client.blob_containers.lock_immutability_policy(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            container_name="str",
+            if_match="str",
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_blob_containers_extend_immutability_policy(self, resource_group):
+        response = self.client.blob_containers.extend_immutability_policy(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            container_name="str",
+            if_match="str",
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_blob_containers_lease(self, resource_group):
+        response = self.client.blob_containers.lease(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            container_name="str",
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_blob_containers_begin_object_level_worm(self, resource_group):
+        response = self.client.blob_containers.begin_object_level_worm(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            container_name="str",
+            api_version="2024-01-01",
+        ).result()  # call '.result()' to poll until service return final result
+
+        # please add some check logic here by yourself
+        # ...
diff --git a/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_blob_containers_operations_async.py b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_blob_containers_operations_async.py
new file mode 100644
index 000000000000..48f5542ec93c
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_blob_containers_operations_async.py
@@ -0,0 +1,335 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+import pytest
+from azure.mgmt.storage.aio import StorageManagementClient
+
+from devtools_testutils import AzureMgmtRecordedTestCase, RandomNameResourceGroupPreparer
+from devtools_testutils.aio import recorded_by_proxy_async
+
+AZURE_LOCATION = "eastus"
+
+
+@pytest.mark.skip("you may need to update the auto-generated test case before run it")
+class TestStorageManagementBlobContainersOperationsAsync(AzureMgmtRecordedTestCase):
+    def setup_method(self, method):
+        self.client = self.create_mgmt_client(StorageManagementClient, is_async=True)
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_blob_containers_list(self, resource_group):
+        response = self.client.blob_containers.list(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            api_version="2024-01-01",
+        )
+        result = [r async for r in response]
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_blob_containers_create(self, resource_group):
+        response = await self.client.blob_containers.create(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            container_name="str",
+            blob_container={
+                "defaultEncryptionScope": "str",
+                "deleted": bool,
+                "deletedTime": "2020-02-20 00:00:00",
+                "denyEncryptionScopeOverride": bool,
+                "enableNfsV3AllSquash": bool,
+                "enableNfsV3RootSquash": bool,
+                "etag": "str",
+                "hasImmutabilityPolicy": bool,
+                "hasLegalHold": bool,
+                "id": "str",
+                "immutabilityPolicy": {
+                    "allowProtectedAppendWrites": bool,
+                    "allowProtectedAppendWritesAll": bool,
+                    "etag": "str",
+                    "immutabilityPeriodSinceCreationInDays": 0,
+                    "state": "str",
+                    "updateHistory": [
+                        {
+                            "allowProtectedAppendWrites": bool,
+                            "allowProtectedAppendWritesAll": bool,
+                            "immutabilityPeriodSinceCreationInDays": 0,
+                            "objectIdentifier": "str",
+                            "tenantId": "str",
+                            "timestamp": "2020-02-20 00:00:00",
+                            "update": "str",
+                            "upn": "str",
+                        }
+                    ],
+                },
+                "immutableStorageWithVersioning": {
+                    "enabled": bool,
+                    "migrationState": "str",
+                    "timeStamp": "2020-02-20 00:00:00",
+                },
+                "lastModifiedTime": "2020-02-20 00:00:00",
+                "leaseDuration": "str",
+                "leaseState": "str",
+                "leaseStatus": "str",
+                "legalHold": {
+                    "hasLegalHold": bool,
+                    "protectedAppendWritesHistory": {
+                        "allowProtectedAppendWritesAll": bool,
+                        "timestamp": "2020-02-20 00:00:00",
+                    },
+                    "tags": [
+                        {
+                            "objectIdentifier": "str",
+                            "tag": "str",
+                            "tenantId": "str",
+                            "timestamp": "2020-02-20 00:00:00",
+                            "upn": "str",
+                        }
+                    ],
+                },
+                "metadata": {"str": "str"},
+                "name": "str",
+                "publicAccess": "str",
+                "remainingRetentionDays": 0,
+                "type": "str",
+                "version": "str",
+            },
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_blob_containers_update(self, resource_group):
+        response = await self.client.blob_containers.update(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            container_name="str",
+            blob_container={
+                "defaultEncryptionScope": "str",
+                "deleted": bool,
+                "deletedTime": "2020-02-20 00:00:00",
+                "denyEncryptionScopeOverride": bool,
+                "enableNfsV3AllSquash": bool,
+                "enableNfsV3RootSquash": bool,
+                "etag": "str",
+                "hasImmutabilityPolicy": bool,
+                "hasLegalHold": bool,
+                "id": "str",
+                "immutabilityPolicy": {
+                    "allowProtectedAppendWrites": bool,
+                    "allowProtectedAppendWritesAll": bool,
+                    "etag": "str",
+                    "immutabilityPeriodSinceCreationInDays": 0,
+                    "state": "str",
+                    "updateHistory": [
+                        {
+                            "allowProtectedAppendWrites": bool,
+                            "allowProtectedAppendWritesAll": bool,
+                            "immutabilityPeriodSinceCreationInDays": 0,
+                            "objectIdentifier": "str",
+                            "tenantId": "str",
+                            "timestamp": "2020-02-20 00:00:00",
+                            "update": "str",
+                            "upn": "str",
+                        }
+                    ],
+                },
+                "immutableStorageWithVersioning": {
+                    "enabled": bool,
+                    "migrationState": "str",
+                    "timeStamp": "2020-02-20 00:00:00",
+                },
+                "lastModifiedTime": "2020-02-20 00:00:00",
+                "leaseDuration": "str",
+                "leaseState": "str",
+                "leaseStatus": "str",
+                "legalHold": {
+                    "hasLegalHold": bool,
+                    "protectedAppendWritesHistory": {
+                        "allowProtectedAppendWritesAll": bool,
+                        "timestamp": "2020-02-20 00:00:00",
+                    },
+                    "tags": [
+                        {
+                            "objectIdentifier": "str",
+                            "tag": "str",
+                            "tenantId": "str",
+                            "timestamp": "2020-02-20 00:00:00",
+                            "upn": "str",
+                        }
+                    ],
+                },
+                "metadata": {"str": "str"},
+                "name": "str",
+                "publicAccess": "str",
+                "remainingRetentionDays": 0,
+                "type": "str",
+                "version": "str",
+            },
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_blob_containers_get(self, resource_group):
+        response = await self.client.blob_containers.get(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            container_name="str",
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_blob_containers_delete(self, resource_group):
+        response = await self.client.blob_containers.delete(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            container_name="str",
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_blob_containers_set_legal_hold(self, resource_group):
+        response = await self.client.blob_containers.set_legal_hold(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            container_name="str",
+            legal_hold={"tags": ["str"], "allowProtectedAppendWritesAll": bool, "hasLegalHold": bool},
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_blob_containers_clear_legal_hold(self, resource_group):
+        response = await self.client.blob_containers.clear_legal_hold(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            container_name="str",
+            legal_hold={"tags": ["str"], "allowProtectedAppendWritesAll": bool, "hasLegalHold": bool},
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_blob_containers_create_or_update_immutability_policy(self, resource_group):
+        response = await self.client.blob_containers.create_or_update_immutability_policy(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            container_name="str",
+            immutability_policy_name="default",
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_blob_containers_get_immutability_policy(self, resource_group):
+        response = await self.client.blob_containers.get_immutability_policy(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            container_name="str",
+            immutability_policy_name="default",
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_blob_containers_delete_immutability_policy(self, resource_group):
+        response = await self.client.blob_containers.delete_immutability_policy(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            container_name="str",
+            if_match="str",
+            immutability_policy_name="default",
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_blob_containers_lock_immutability_policy(self, resource_group):
+        response = await self.client.blob_containers.lock_immutability_policy(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            container_name="str",
+            if_match="str",
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_blob_containers_extend_immutability_policy(self, resource_group):
+        response = await self.client.blob_containers.extend_immutability_policy(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            container_name="str",
+            if_match="str",
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_blob_containers_lease(self, resource_group):
+        response = await self.client.blob_containers.lease(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            container_name="str",
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_blob_containers_begin_object_level_worm(self, resource_group):
+        response = await (
+            await self.client.blob_containers.begin_object_level_worm(
+                resource_group_name=resource_group.name,
+                account_name="str",
+                container_name="str",
+                api_version="2024-01-01",
+            )
+        ).result()  # call '.result()' to poll until service return final result
+
+        # please add some check logic here by yourself
+        # ...
diff --git a/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_blob_inventory_policies_operations.py b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_blob_inventory_policies_operations.py
new file mode 100644
index 000000000000..e140e9e33a3b
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_blob_inventory_policies_operations.py
@@ -0,0 +1,111 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+import pytest
+from azure.mgmt.storage import StorageManagementClient
+
+from devtools_testutils import AzureMgmtRecordedTestCase, RandomNameResourceGroupPreparer, recorded_by_proxy
+
+AZURE_LOCATION = "eastus"
+
+
+@pytest.mark.skip("you may need to update the auto-generated test case before run it")
+class TestStorageManagementBlobInventoryPoliciesOperations(AzureMgmtRecordedTestCase):
+    def setup_method(self, method):
+        self.client = self.create_mgmt_client(StorageManagementClient)
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_blob_inventory_policies_get(self, resource_group):
+        response = self.client.blob_inventory_policies.get(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            blob_inventory_policy_name="str",
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_blob_inventory_policies_create_or_update(self, resource_group):
+        response = self.client.blob_inventory_policies.create_or_update(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            blob_inventory_policy_name="str",
+            properties={
+                "id": "str",
+                "lastModifiedTime": "2020-02-20 00:00:00",
+                "name": "str",
+                "policy": {
+                    "enabled": bool,
+                    "rules": [
+                        {
+                            "definition": {
+                                "format": "str",
+                                "objectType": "str",
+                                "schedule": "str",
+                                "schemaFields": ["str"],
+                                "filters": {
+                                    "blobTypes": ["str"],
+                                    "creationTime": {"lastNDays": 0},
+                                    "excludePrefix": ["str"],
+                                    "includeBlobVersions": bool,
+                                    "includeDeleted": bool,
+                                    "includeSnapshots": bool,
+                                    "prefixMatch": ["str"],
+                                },
+                            },
+                            "destination": "str",
+                            "enabled": bool,
+                            "name": "str",
+                        }
+                    ],
+                    "type": "str",
+                    "destination": "str",
+                },
+                "systemData": {
+                    "createdAt": "2020-02-20 00:00:00",
+                    "createdBy": "str",
+                    "createdByType": "str",
+                    "lastModifiedAt": "2020-02-20 00:00:00",
+                    "lastModifiedBy": "str",
+                    "lastModifiedByType": "str",
+                },
+                "type": "str",
+            },
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_blob_inventory_policies_delete(self, resource_group):
+        response = self.client.blob_inventory_policies.delete(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            blob_inventory_policy_name="str",
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_blob_inventory_policies_list(self, resource_group):
+        response = self.client.blob_inventory_policies.list(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            api_version="2024-01-01",
+        )
+        result = [r for r in response]
+        # please add some check logic here by yourself
+        # ...
diff --git a/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_blob_inventory_policies_operations_async.py b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_blob_inventory_policies_operations_async.py
new file mode 100644
index 000000000000..5550d0b90e60
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_blob_inventory_policies_operations_async.py
@@ -0,0 +1,112 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+import pytest
+from azure.mgmt.storage.aio import StorageManagementClient
+
+from devtools_testutils import AzureMgmtRecordedTestCase, RandomNameResourceGroupPreparer
+from devtools_testutils.aio import recorded_by_proxy_async
+
+AZURE_LOCATION = "eastus"
+
+
+@pytest.mark.skip("you may need to update the auto-generated test case before run it")
+class TestStorageManagementBlobInventoryPoliciesOperationsAsync(AzureMgmtRecordedTestCase):
+    def setup_method(self, method):
+        self.client = self.create_mgmt_client(StorageManagementClient, is_async=True)
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_blob_inventory_policies_get(self, resource_group):
+        response = await self.client.blob_inventory_policies.get(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            blob_inventory_policy_name="str",
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_blob_inventory_policies_create_or_update(self, resource_group):
+        response = await self.client.blob_inventory_policies.create_or_update(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            blob_inventory_policy_name="str",
+            properties={
+                "id": "str",
+                "lastModifiedTime": "2020-02-20 00:00:00",
+                "name": "str",
+                "policy": {
+                    "enabled": bool,
+                    "rules": [
+                        {
+                            "definition": {
+                                "format": "str",
+                                "objectType": "str",
+                                "schedule": "str",
+                                "schemaFields": ["str"],
+                                "filters": {
+                                    "blobTypes": ["str"],
+                                    "creationTime": {"lastNDays": 0},
+                                    "excludePrefix": ["str"],
+                                    "includeBlobVersions": bool,
+                                    "includeDeleted": bool,
+                                    "includeSnapshots": bool,
+                                    "prefixMatch": ["str"],
+                                },
+                            },
+                            "destination": "str",
+                            "enabled": bool,
+                            "name": "str",
+                        }
+                    ],
+                    "type": "str",
+                    "destination": "str",
+                },
+                "systemData": {
+                    "createdAt": "2020-02-20 00:00:00",
+                    "createdBy": "str",
+                    "createdByType": "str",
+                    "lastModifiedAt": "2020-02-20 00:00:00",
+                    "lastModifiedBy": "str",
+                    "lastModifiedByType": "str",
+                },
+                "type": "str",
+            },
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_blob_inventory_policies_delete(self, resource_group):
+        response = await self.client.blob_inventory_policies.delete(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            blob_inventory_policy_name="str",
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_blob_inventory_policies_list(self, resource_group):
+        response = self.client.blob_inventory_policies.list(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            api_version="2024-01-01",
+        )
+        result = [r async for r in response]
+        # please add some check logic here by yourself
+        # ...
diff --git a/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_blob_services_operations.py b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_blob_services_operations.py
new file mode 100644
index 000000000000..b49f714cc3a6
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_blob_services_operations.py
@@ -0,0 +1,92 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+import pytest
+from azure.mgmt.storage import StorageManagementClient
+
+from devtools_testutils import AzureMgmtRecordedTestCase, RandomNameResourceGroupPreparer, recorded_by_proxy
+
+AZURE_LOCATION = "eastus"
+
+
+@pytest.mark.skip("you may need to update the auto-generated test case before run it")
+class TestStorageManagementBlobServicesOperations(AzureMgmtRecordedTestCase):
+    def setup_method(self, method):
+        self.client = self.create_mgmt_client(StorageManagementClient)
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_blob_services_list(self, resource_group):
+        response = self.client.blob_services.list(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            api_version="2024-01-01",
+        )
+        result = [r for r in response]
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_blob_services_set_service_properties(self, resource_group):
+        response = self.client.blob_services.set_service_properties(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            parameters={
+                "automaticSnapshotPolicyEnabled": bool,
+                "changeFeed": {"enabled": bool, "retentionInDays": 0},
+                "containerDeleteRetentionPolicy": {"allowPermanentDelete": bool, "days": 0, "enabled": bool},
+                "cors": {
+                    "corsRules": [
+                        {
+                            "allowedHeaders": ["str"],
+                            "allowedMethods": ["str"],
+                            "allowedOrigins": ["str"],
+                            "exposedHeaders": ["str"],
+                            "maxAgeInSeconds": 0,
+                        }
+                    ]
+                },
+                "defaultServiceVersion": "str",
+                "deleteRetentionPolicy": {"allowPermanentDelete": bool, "days": 0, "enabled": bool},
+                "id": "str",
+                "isVersioningEnabled": bool,
+                "lastAccessTimeTrackingPolicy": {
+                    "enable": bool,
+                    "blobType": ["str"],
+                    "name": "str",
+                    "trackingGranularityInDays": 0,
+                },
+                "name": "str",
+                "restorePolicy": {
+                    "enabled": bool,
+                    "days": 0,
+                    "lastEnabledTime": "2020-02-20 00:00:00",
+                    "minRestoreTime": "2020-02-20 00:00:00",
+                },
+                "sku": {"name": "str", "tier": "str"},
+                "type": "str",
+            },
+            api_version="2024-01-01",
+            blob_services_name="default",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_blob_services_get_service_properties(self, resource_group):
+        response = self.client.blob_services.get_service_properties(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            api_version="2024-01-01",
+            blob_services_name="default",
+        )
+
+        # please add some check logic here by yourself
+        # ...
diff --git a/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_blob_services_operations_async.py b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_blob_services_operations_async.py
new file mode 100644
index 000000000000..7f78ac3a6ff6
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_blob_services_operations_async.py
@@ -0,0 +1,93 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+import pytest
+from azure.mgmt.storage.aio import StorageManagementClient
+
+from devtools_testutils import AzureMgmtRecordedTestCase, RandomNameResourceGroupPreparer
+from devtools_testutils.aio import recorded_by_proxy_async
+
+AZURE_LOCATION = "eastus"
+
+
+@pytest.mark.skip("you may need to update the auto-generated test case before run it")
+class TestStorageManagementBlobServicesOperationsAsync(AzureMgmtRecordedTestCase):
+    def setup_method(self, method):
+        self.client = self.create_mgmt_client(StorageManagementClient, is_async=True)
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_blob_services_list(self, resource_group):
+        response = self.client.blob_services.list(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            api_version="2024-01-01",
+        )
+        result = [r async for r in response]
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_blob_services_set_service_properties(self, resource_group):
+        response = await self.client.blob_services.set_service_properties(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            parameters={
+                "automaticSnapshotPolicyEnabled": bool,
+                "changeFeed": {"enabled": bool, "retentionInDays": 0},
+                "containerDeleteRetentionPolicy": {"allowPermanentDelete": bool, "days": 0, "enabled": bool},
+                "cors": {
+                    "corsRules": [
+                        {
+                            "allowedHeaders": ["str"],
+                            "allowedMethods": ["str"],
+                            "allowedOrigins": ["str"],
+                            "exposedHeaders": ["str"],
+                            "maxAgeInSeconds": 0,
+                        }
+                    ]
+                },
+                "defaultServiceVersion": "str",
+                "deleteRetentionPolicy": {"allowPermanentDelete": bool, "days": 0, "enabled": bool},
+                "id": "str",
+                "isVersioningEnabled": bool,
+                "lastAccessTimeTrackingPolicy": {
+                    "enable": bool,
+                    "blobType": ["str"],
+                    "name": "str",
+                    "trackingGranularityInDays": 0,
+                },
+                "name": "str",
+                "restorePolicy": {
+                    "enabled": bool,
+                    "days": 0,
+                    "lastEnabledTime": "2020-02-20 00:00:00",
+                    "minRestoreTime": "2020-02-20 00:00:00",
+                },
+                "sku": {"name": "str", "tier": "str"},
+                "type": "str",
+            },
+            api_version="2024-01-01",
+            blob_services_name="default",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_blob_services_get_service_properties(self, resource_group):
+        response = await self.client.blob_services.get_service_properties(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            api_version="2024-01-01",
+            blob_services_name="default",
+        )
+
+        # please add some check logic here by yourself
+        # ...
diff --git a/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_deleted_accounts_operations.py b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_deleted_accounts_operations.py
new file mode 100644
index 000000000000..ca15e8fd0c89
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_deleted_accounts_operations.py
@@ -0,0 +1,41 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+import pytest
+from azure.mgmt.storage import StorageManagementClient
+
+from devtools_testutils import AzureMgmtRecordedTestCase, RandomNameResourceGroupPreparer, recorded_by_proxy
+
+AZURE_LOCATION = "eastus"
+
+
+@pytest.mark.skip("you may need to update the auto-generated test case before run it")
+class TestStorageManagementDeletedAccountsOperations(AzureMgmtRecordedTestCase):
+    def setup_method(self, method):
+        self.client = self.create_mgmt_client(StorageManagementClient)
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_deleted_accounts_list(self, resource_group):
+        response = self.client.deleted_accounts.list(
+            api_version="2024-01-01",
+        )
+        result = [r for r in response]
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_deleted_accounts_get(self, resource_group):
+        response = self.client.deleted_accounts.get(
+            deleted_account_name="str",
+            location="str",
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
diff --git a/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_deleted_accounts_operations_async.py b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_deleted_accounts_operations_async.py
new file mode 100644
index 000000000000..f41ba8858628
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_deleted_accounts_operations_async.py
@@ -0,0 +1,42 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+import pytest
+from azure.mgmt.storage.aio import StorageManagementClient
+
+from devtools_testutils import AzureMgmtRecordedTestCase, RandomNameResourceGroupPreparer
+from devtools_testutils.aio import recorded_by_proxy_async
+
+AZURE_LOCATION = "eastus"
+
+
+@pytest.mark.skip("you may need to update the auto-generated test case before run it")
+class TestStorageManagementDeletedAccountsOperationsAsync(AzureMgmtRecordedTestCase):
+    def setup_method(self, method):
+        self.client = self.create_mgmt_client(StorageManagementClient, is_async=True)
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_deleted_accounts_list(self, resource_group):
+        response = self.client.deleted_accounts.list(
+            api_version="2024-01-01",
+        )
+        result = [r async for r in response]
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_deleted_accounts_get(self, resource_group):
+        response = await self.client.deleted_accounts.get(
+            deleted_account_name="str",
+            location="str",
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
diff --git a/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_encryption_scopes_operations.py b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_encryption_scopes_operations.py
new file mode 100644
index 000000000000..490d16b421d7
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_encryption_scopes_operations.py
@@ -0,0 +1,100 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+import pytest
+from azure.mgmt.storage import StorageManagementClient
+
+from devtools_testutils import AzureMgmtRecordedTestCase, RandomNameResourceGroupPreparer, recorded_by_proxy
+
+AZURE_LOCATION = "eastus"
+
+
+@pytest.mark.skip("you may need to update the auto-generated test case before run it")
+class TestStorageManagementEncryptionScopesOperations(AzureMgmtRecordedTestCase):
+    def setup_method(self, method):
+        self.client = self.create_mgmt_client(StorageManagementClient)
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_encryption_scopes_put(self, resource_group):
+        response = self.client.encryption_scopes.put(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            encryption_scope_name="str",
+            encryption_scope={
+                "creationTime": "2020-02-20 00:00:00",
+                "id": "str",
+                "keyVaultProperties": {
+                    "currentVersionedKeyIdentifier": "str",
+                    "keyUri": "str",
+                    "lastKeyRotationTimestamp": "2020-02-20 00:00:00",
+                },
+                "lastModifiedTime": "2020-02-20 00:00:00",
+                "name": "str",
+                "requireInfrastructureEncryption": bool,
+                "source": "str",
+                "state": "str",
+                "type": "str",
+            },
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_encryption_scopes_patch(self, resource_group):
+        response = self.client.encryption_scopes.patch(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            encryption_scope_name="str",
+            encryption_scope={
+                "creationTime": "2020-02-20 00:00:00",
+                "id": "str",
+                "keyVaultProperties": {
+                    "currentVersionedKeyIdentifier": "str",
+                    "keyUri": "str",
+                    "lastKeyRotationTimestamp": "2020-02-20 00:00:00",
+                },
+                "lastModifiedTime": "2020-02-20 00:00:00",
+                "name": "str",
+                "requireInfrastructureEncryption": bool,
+                "source": "str",
+                "state": "str",
+                "type": "str",
+            },
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_encryption_scopes_get(self, resource_group):
+        response = self.client.encryption_scopes.get(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            encryption_scope_name="str",
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_encryption_scopes_list(self, resource_group):
+        response = self.client.encryption_scopes.list(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            api_version="2024-01-01",
+        )
+        result = [r for r in response]
+        # please add some check logic here by yourself
+        # ...
diff --git a/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_encryption_scopes_operations_async.py b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_encryption_scopes_operations_async.py
new file mode 100644
index 000000000000..6466547c9669
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_encryption_scopes_operations_async.py
@@ -0,0 +1,101 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+import pytest
+from azure.mgmt.storage.aio import StorageManagementClient
+
+from devtools_testutils import AzureMgmtRecordedTestCase, RandomNameResourceGroupPreparer
+from devtools_testutils.aio import recorded_by_proxy_async
+
+AZURE_LOCATION = "eastus"
+
+
+@pytest.mark.skip("you may need to update the auto-generated test case before run it")
+class TestStorageManagementEncryptionScopesOperationsAsync(AzureMgmtRecordedTestCase):
+    def setup_method(self, method):
+        self.client = self.create_mgmt_client(StorageManagementClient, is_async=True)
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_encryption_scopes_put(self, resource_group):
+        response = await self.client.encryption_scopes.put(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            encryption_scope_name="str",
+            encryption_scope={
+                "creationTime": "2020-02-20 00:00:00",
+                "id": "str",
+                "keyVaultProperties": {
+                    "currentVersionedKeyIdentifier": "str",
+                    "keyUri": "str",
+                    "lastKeyRotationTimestamp": "2020-02-20 00:00:00",
+                },
+                "lastModifiedTime": "2020-02-20 00:00:00",
+                "name": "str",
+                "requireInfrastructureEncryption": bool,
+                "source": "str",
+                "state": "str",
+                "type": "str",
+            },
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_encryption_scopes_patch(self, resource_group):
+        response = await self.client.encryption_scopes.patch(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            encryption_scope_name="str",
+            encryption_scope={
+                "creationTime": "2020-02-20 00:00:00",
+                "id": "str",
+                "keyVaultProperties": {
+                    "currentVersionedKeyIdentifier": "str",
+                    "keyUri": "str",
+                    "lastKeyRotationTimestamp": "2020-02-20 00:00:00",
+                },
+                "lastModifiedTime": "2020-02-20 00:00:00",
+                "name": "str",
+                "requireInfrastructureEncryption": bool,
+                "source": "str",
+                "state": "str",
+                "type": "str",
+            },
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_encryption_scopes_get(self, resource_group):
+        response = await self.client.encryption_scopes.get(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            encryption_scope_name="str",
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_encryption_scopes_list(self, resource_group):
+        response = self.client.encryption_scopes.list(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            api_version="2024-01-01",
+        )
+        result = [r async for r in response]
+        # please add some check logic here by yourself
+        # ...
diff --git a/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_file_services_operations.py b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_file_services_operations.py
new file mode 100644
index 000000000000..680ac6365b46
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_file_services_operations.py
@@ -0,0 +1,111 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+import pytest
+from azure.mgmt.storage import StorageManagementClient
+
+from devtools_testutils import AzureMgmtRecordedTestCase, RandomNameResourceGroupPreparer, recorded_by_proxy
+
+AZURE_LOCATION = "eastus"
+
+
+@pytest.mark.skip("you may need to update the auto-generated test case before run it")
+class TestStorageManagementFileServicesOperations(AzureMgmtRecordedTestCase):
+    def setup_method(self, method):
+        self.client = self.create_mgmt_client(StorageManagementClient)
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_file_services_list(self, resource_group):
+        response = self.client.file_services.list(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_file_services_set_service_properties(self, resource_group):
+        response = self.client.file_services.set_service_properties(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            parameters={
+                "cors": {
+                    "corsRules": [
+                        {
+                            "allowedHeaders": ["str"],
+                            "allowedMethods": ["str"],
+                            "allowedOrigins": ["str"],
+                            "exposedHeaders": ["str"],
+                            "maxAgeInSeconds": 0,
+                        }
+                    ]
+                },
+                "id": "str",
+                "name": "str",
+                "protocolSettings": {
+                    "smb": {
+                        "authenticationMethods": "str",
+                        "channelEncryption": "str",
+                        "kerberosTicketEncryption": "str",
+                        "multichannel": {"enabled": bool},
+                        "versions": "str",
+                    }
+                },
+                "shareDeleteRetentionPolicy": {"allowPermanentDelete": bool, "days": 0, "enabled": bool},
+                "sku": {"name": "str", "tier": "str"},
+                "type": "str",
+            },
+            api_version="2024-01-01",
+            file_services_name="default",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_file_services_get_service_properties(self, resource_group):
+        response = self.client.file_services.get_service_properties(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            api_version="2024-01-01",
+            file_services_name="default",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_file_services_list_service_usages(self, resource_group):
+        response = self.client.file_services.list_service_usages(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            api_version="2024-01-01",
+            file_services_name="default",
+        )
+        result = [r for r in response]
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_file_services_get_service_usage(self, resource_group):
+        response = self.client.file_services.get_service_usage(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            api_version="2024-01-01",
+            file_services_name="default",
+            file_service_usages_name="default",
+        )
+
+        # please add some check logic here by yourself
+        # ...
diff --git a/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_file_services_operations_async.py b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_file_services_operations_async.py
new file mode 100644
index 000000000000..bc52b1cfb7b5
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_file_services_operations_async.py
@@ -0,0 +1,112 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+import pytest
+from azure.mgmt.storage.aio import StorageManagementClient
+
+from devtools_testutils import AzureMgmtRecordedTestCase, RandomNameResourceGroupPreparer
+from devtools_testutils.aio import recorded_by_proxy_async
+
+AZURE_LOCATION = "eastus"
+
+
+@pytest.mark.skip("you may need to update the auto-generated test case before run it")
+class TestStorageManagementFileServicesOperationsAsync(AzureMgmtRecordedTestCase):
+    def setup_method(self, method):
+        self.client = self.create_mgmt_client(StorageManagementClient, is_async=True)
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_file_services_list(self, resource_group):
+        response = await self.client.file_services.list(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_file_services_set_service_properties(self, resource_group):
+        response = await self.client.file_services.set_service_properties(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            parameters={
+                "cors": {
+                    "corsRules": [
+                        {
+                            "allowedHeaders": ["str"],
+                            "allowedMethods": ["str"],
+                            "allowedOrigins": ["str"],
+                            "exposedHeaders": ["str"],
+                            "maxAgeInSeconds": 0,
+                        }
+                    ]
+                },
+                "id": "str",
+                "name": "str",
+                "protocolSettings": {
+                    "smb": {
+                        "authenticationMethods": "str",
+                        "channelEncryption": "str",
+                        "kerberosTicketEncryption": "str",
+                        "multichannel": {"enabled": bool},
+                        "versions": "str",
+                    }
+                },
+                "shareDeleteRetentionPolicy": {"allowPermanentDelete": bool, "days": 0, "enabled": bool},
+                "sku": {"name": "str", "tier": "str"},
+                "type": "str",
+            },
+            api_version="2024-01-01",
+            file_services_name="default",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_file_services_get_service_properties(self, resource_group):
+        response = await self.client.file_services.get_service_properties(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            api_version="2024-01-01",
+            file_services_name="default",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_file_services_list_service_usages(self, resource_group):
+        response = self.client.file_services.list_service_usages(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            api_version="2024-01-01",
+            file_services_name="default",
+        )
+        result = [r async for r in response]
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_file_services_get_service_usage(self, resource_group):
+        response = await self.client.file_services.get_service_usage(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            api_version="2024-01-01",
+            file_services_name="default",
+            file_service_usages_name="default",
+        )
+
+        # please add some check logic here by yourself
+        # ...
diff --git a/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_file_shares_operations.py b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_file_shares_operations.py
new file mode 100644
index 000000000000..c41ce2263532
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_file_shares_operations.py
@@ -0,0 +1,200 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+import pytest
+from azure.mgmt.storage import StorageManagementClient
+
+from devtools_testutils import AzureMgmtRecordedTestCase, RandomNameResourceGroupPreparer, recorded_by_proxy
+
+AZURE_LOCATION = "eastus"
+
+
+@pytest.mark.skip("you may need to update the auto-generated test case before run it")
+class TestStorageManagementFileSharesOperations(AzureMgmtRecordedTestCase):
+    def setup_method(self, method):
+        self.client = self.create_mgmt_client(StorageManagementClient)
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_file_shares_list(self, resource_group):
+        response = self.client.file_shares.list(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            api_version="2024-01-01",
+        )
+        result = [r for r in response]
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_file_shares_create(self, resource_group):
+        response = self.client.file_shares.create(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            share_name="str",
+            file_share={
+                "accessTier": "str",
+                "accessTierChangeTime": "2020-02-20 00:00:00",
+                "accessTierStatus": "str",
+                "deleted": bool,
+                "deletedTime": "2020-02-20 00:00:00",
+                "enabledProtocols": "str",
+                "etag": "str",
+                "fileSharePaidBursting": {
+                    "paidBurstingEnabled": bool,
+                    "paidBurstingMaxBandwidthMibps": 0,
+                    "paidBurstingMaxIops": 0,
+                },
+                "id": "str",
+                "includedBurstIops": 0,
+                "lastModifiedTime": "2020-02-20 00:00:00",
+                "leaseDuration": "str",
+                "leaseState": "str",
+                "leaseStatus": "str",
+                "maxBurstCreditsForIops": 0,
+                "metadata": {"str": "str"},
+                "name": "str",
+                "nextAllowedProvisionedBandwidthDowngradeTime": "2020-02-20 00:00:00",
+                "nextAllowedProvisionedIopsDowngradeTime": "2020-02-20 00:00:00",
+                "nextAllowedQuotaDowngradeTime": "2020-02-20 00:00:00",
+                "provisionedBandwidthMibps": 0,
+                "provisionedIops": 0,
+                "remainingRetentionDays": 0,
+                "rootSquash": "str",
+                "shareQuota": 0,
+                "shareUsageBytes": 0,
+                "signedIdentifiers": [
+                    {
+                        "accessPolicy": {
+                            "expiryTime": "2020-02-20 00:00:00",
+                            "permission": "str",
+                            "startTime": "2020-02-20 00:00:00",
+                        },
+                        "id": "str",
+                    }
+                ],
+                "snapshotTime": "2020-02-20 00:00:00",
+                "type": "str",
+                "version": "str",
+            },
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_file_shares_update(self, resource_group):
+        response = self.client.file_shares.update(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            share_name="str",
+            file_share={
+                "accessTier": "str",
+                "accessTierChangeTime": "2020-02-20 00:00:00",
+                "accessTierStatus": "str",
+                "deleted": bool,
+                "deletedTime": "2020-02-20 00:00:00",
+                "enabledProtocols": "str",
+                "etag": "str",
+                "fileSharePaidBursting": {
+                    "paidBurstingEnabled": bool,
+                    "paidBurstingMaxBandwidthMibps": 0,
+                    "paidBurstingMaxIops": 0,
+                },
+                "id": "str",
+                "includedBurstIops": 0,
+                "lastModifiedTime": "2020-02-20 00:00:00",
+                "leaseDuration": "str",
+                "leaseState": "str",
+                "leaseStatus": "str",
+                "maxBurstCreditsForIops": 0,
+                "metadata": {"str": "str"},
+                "name": "str",
+                "nextAllowedProvisionedBandwidthDowngradeTime": "2020-02-20 00:00:00",
+                "nextAllowedProvisionedIopsDowngradeTime": "2020-02-20 00:00:00",
+                "nextAllowedQuotaDowngradeTime": "2020-02-20 00:00:00",
+                "provisionedBandwidthMibps": 0,
+                "provisionedIops": 0,
+                "remainingRetentionDays": 0,
+                "rootSquash": "str",
+                "shareQuota": 0,
+                "shareUsageBytes": 0,
+                "signedIdentifiers": [
+                    {
+                        "accessPolicy": {
+                            "expiryTime": "2020-02-20 00:00:00",
+                            "permission": "str",
+                            "startTime": "2020-02-20 00:00:00",
+                        },
+                        "id": "str",
+                    }
+                ],
+                "snapshotTime": "2020-02-20 00:00:00",
+                "type": "str",
+                "version": "str",
+            },
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_file_shares_get(self, resource_group):
+        response = self.client.file_shares.get(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            share_name="str",
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_file_shares_delete(self, resource_group):
+        response = self.client.file_shares.delete(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            share_name="str",
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_file_shares_restore(self, resource_group):
+        response = self.client.file_shares.restore(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            share_name="str",
+            deleted_share={"deletedShareName": "str", "deletedShareVersion": "str"},
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_file_shares_lease(self, resource_group):
+        response = self.client.file_shares.lease(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            share_name="str",
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
diff --git a/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_file_shares_operations_async.py b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_file_shares_operations_async.py
new file mode 100644
index 000000000000..7362e277626c
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_file_shares_operations_async.py
@@ -0,0 +1,201 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+import pytest
+from azure.mgmt.storage.aio import StorageManagementClient
+
+from devtools_testutils import AzureMgmtRecordedTestCase, RandomNameResourceGroupPreparer
+from devtools_testutils.aio import recorded_by_proxy_async
+
+AZURE_LOCATION = "eastus"
+
+
+@pytest.mark.skip("you may need to update the auto-generated test case before run it")
+class TestStorageManagementFileSharesOperationsAsync(AzureMgmtRecordedTestCase):
+    def setup_method(self, method):
+        self.client = self.create_mgmt_client(StorageManagementClient, is_async=True)
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_file_shares_list(self, resource_group):
+        response = self.client.file_shares.list(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            api_version="2024-01-01",
+        )
+        result = [r async for r in response]
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_file_shares_create(self, resource_group):
+        response = await self.client.file_shares.create(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            share_name="str",
+            file_share={
+                "accessTier": "str",
+                "accessTierChangeTime": "2020-02-20 00:00:00",
+                "accessTierStatus": "str",
+                "deleted": bool,
+                "deletedTime": "2020-02-20 00:00:00",
+                "enabledProtocols": "str",
+                "etag": "str",
+                "fileSharePaidBursting": {
+                    "paidBurstingEnabled": bool,
+                    "paidBurstingMaxBandwidthMibps": 0,
+                    "paidBurstingMaxIops": 0,
+                },
+                "id": "str",
+                "includedBurstIops": 0,
+                "lastModifiedTime": "2020-02-20 00:00:00",
+                "leaseDuration": "str",
+                "leaseState": "str",
+                "leaseStatus": "str",
+                "maxBurstCreditsForIops": 0,
+                "metadata": {"str": "str"},
+                "name": "str",
+                "nextAllowedProvisionedBandwidthDowngradeTime": "2020-02-20 00:00:00",
+                "nextAllowedProvisionedIopsDowngradeTime": "2020-02-20 00:00:00",
+                "nextAllowedQuotaDowngradeTime": "2020-02-20 00:00:00",
+                "provisionedBandwidthMibps": 0,
+                "provisionedIops": 0,
+                "remainingRetentionDays": 0,
+                "rootSquash": "str",
+                "shareQuota": 0,
+                "shareUsageBytes": 0,
+                "signedIdentifiers": [
+                    {
+                        "accessPolicy": {
+                            "expiryTime": "2020-02-20 00:00:00",
+                            "permission": "str",
+                            "startTime": "2020-02-20 00:00:00",
+                        },
+                        "id": "str",
+                    }
+                ],
+                "snapshotTime": "2020-02-20 00:00:00",
+                "type": "str",
+                "version": "str",
+            },
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_file_shares_update(self, resource_group):
+        response = await self.client.file_shares.update(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            share_name="str",
+            file_share={
+                "accessTier": "str",
+                "accessTierChangeTime": "2020-02-20 00:00:00",
+                "accessTierStatus": "str",
+                "deleted": bool,
+                "deletedTime": "2020-02-20 00:00:00",
+                "enabledProtocols": "str",
+                "etag": "str",
+                "fileSharePaidBursting": {
+                    "paidBurstingEnabled": bool,
+                    "paidBurstingMaxBandwidthMibps": 0,
+                    "paidBurstingMaxIops": 0,
+                },
+                "id": "str",
+                "includedBurstIops": 0,
+                "lastModifiedTime": "2020-02-20 00:00:00",
+                "leaseDuration": "str",
+                "leaseState": "str",
+                "leaseStatus": "str",
+                "maxBurstCreditsForIops": 0,
+                "metadata": {"str": "str"},
+                "name": "str",
+                "nextAllowedProvisionedBandwidthDowngradeTime": "2020-02-20 00:00:00",
+                "nextAllowedProvisionedIopsDowngradeTime": "2020-02-20 00:00:00",
+                "nextAllowedQuotaDowngradeTime": "2020-02-20 00:00:00",
+                "provisionedBandwidthMibps": 0,
+                "provisionedIops": 0,
+                "remainingRetentionDays": 0,
+                "rootSquash": "str",
+                "shareQuota": 0,
+                "shareUsageBytes": 0,
+                "signedIdentifiers": [
+                    {
+                        "accessPolicy": {
+                            "expiryTime": "2020-02-20 00:00:00",
+                            "permission": "str",
+                            "startTime": "2020-02-20 00:00:00",
+                        },
+                        "id": "str",
+                    }
+                ],
+                "snapshotTime": "2020-02-20 00:00:00",
+                "type": "str",
+                "version": "str",
+            },
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_file_shares_get(self, resource_group):
+        response = await self.client.file_shares.get(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            share_name="str",
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_file_shares_delete(self, resource_group):
+        response = await self.client.file_shares.delete(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            share_name="str",
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_file_shares_restore(self, resource_group):
+        response = await self.client.file_shares.restore(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            share_name="str",
+            deleted_share={"deletedShareName": "str", "deletedShareVersion": "str"},
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_file_shares_lease(self, resource_group):
+        response = await self.client.file_shares.lease(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            share_name="str",
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
diff --git a/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_local_users_operations.py b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_local_users_operations.py
new file mode 100644
index 000000000000..12c9d0a630c7
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_local_users_operations.py
@@ -0,0 +1,121 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+import pytest
+from azure.mgmt.storage import StorageManagementClient
+
+from devtools_testutils import AzureMgmtRecordedTestCase, RandomNameResourceGroupPreparer, recorded_by_proxy
+
+AZURE_LOCATION = "eastus"
+
+
+@pytest.mark.skip("you may need to update the auto-generated test case before run it")
+class TestStorageManagementLocalUsersOperations(AzureMgmtRecordedTestCase):
+    def setup_method(self, method):
+        self.client = self.create_mgmt_client(StorageManagementClient)
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_local_users_list(self, resource_group):
+        response = self.client.local_users.list(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            api_version="2024-01-01",
+        )
+        result = [r for r in response]
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_local_users_get(self, resource_group):
+        response = self.client.local_users.get(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            username="str",
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_local_users_create_or_update(self, resource_group):
+        response = self.client.local_users.create_or_update(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            username="str",
+            properties={
+                "allowAclAuthorization": bool,
+                "extendedGroups": [0],
+                "groupId": 0,
+                "hasSharedKey": bool,
+                "hasSshKey": bool,
+                "hasSshPassword": bool,
+                "homeDirectory": "str",
+                "id": "str",
+                "isNFSv3Enabled": bool,
+                "name": "str",
+                "permissionScopes": [{"permissions": "str", "resourceName": "str", "service": "str"}],
+                "sid": "str",
+                "sshAuthorizedKeys": [{"description": "str", "key": "str"}],
+                "systemData": {
+                    "createdAt": "2020-02-20 00:00:00",
+                    "createdBy": "str",
+                    "createdByType": "str",
+                    "lastModifiedAt": "2020-02-20 00:00:00",
+                    "lastModifiedBy": "str",
+                    "lastModifiedByType": "str",
+                },
+                "type": "str",
+                "userId": 0,
+            },
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_local_users_delete(self, resource_group):
+        response = self.client.local_users.delete(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            username="str",
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_local_users_list_keys(self, resource_group):
+        response = self.client.local_users.list_keys(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            username="str",
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_local_users_regenerate_password(self, resource_group):
+        response = self.client.local_users.regenerate_password(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            username="str",
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
diff --git a/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_local_users_operations_async.py b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_local_users_operations_async.py
new file mode 100644
index 000000000000..d1f8a08b0d9d
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_local_users_operations_async.py
@@ -0,0 +1,122 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+import pytest
+from azure.mgmt.storage.aio import StorageManagementClient
+
+from devtools_testutils import AzureMgmtRecordedTestCase, RandomNameResourceGroupPreparer
+from devtools_testutils.aio import recorded_by_proxy_async
+
+AZURE_LOCATION = "eastus"
+
+
+@pytest.mark.skip("you may need to update the auto-generated test case before run it")
+class TestStorageManagementLocalUsersOperationsAsync(AzureMgmtRecordedTestCase):
+    def setup_method(self, method):
+        self.client = self.create_mgmt_client(StorageManagementClient, is_async=True)
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_local_users_list(self, resource_group):
+        response = self.client.local_users.list(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            api_version="2024-01-01",
+        )
+        result = [r async for r in response]
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_local_users_get(self, resource_group):
+        response = await self.client.local_users.get(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            username="str",
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_local_users_create_or_update(self, resource_group):
+        response = await self.client.local_users.create_or_update(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            username="str",
+            properties={
+                "allowAclAuthorization": bool,
+                "extendedGroups": [0],
+                "groupId": 0,
+                "hasSharedKey": bool,
+                "hasSshKey": bool,
+                "hasSshPassword": bool,
+                "homeDirectory": "str",
+                "id": "str",
+                "isNFSv3Enabled": bool,
+                "name": "str",
+                "permissionScopes": [{"permissions": "str", "resourceName": "str", "service": "str"}],
+                "sid": "str",
+                "sshAuthorizedKeys": [{"description": "str", "key": "str"}],
+                "systemData": {
+                    "createdAt": "2020-02-20 00:00:00",
+                    "createdBy": "str",
+                    "createdByType": "str",
+                    "lastModifiedAt": "2020-02-20 00:00:00",
+                    "lastModifiedBy": "str",
+                    "lastModifiedByType": "str",
+                },
+                "type": "str",
+                "userId": 0,
+            },
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_local_users_delete(self, resource_group):
+        response = await self.client.local_users.delete(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            username="str",
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_local_users_list_keys(self, resource_group):
+        response = await self.client.local_users.list_keys(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            username="str",
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_local_users_regenerate_password(self, resource_group):
+        response = await self.client.local_users.regenerate_password(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            username="str",
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
diff --git a/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_management_policies_operations.py b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_management_policies_operations.py
new file mode 100644
index 000000000000..8921eac74aaa
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_management_policies_operations.py
@@ -0,0 +1,159 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+import pytest
+from azure.mgmt.storage import StorageManagementClient
+
+from devtools_testutils import AzureMgmtRecordedTestCase, RandomNameResourceGroupPreparer, recorded_by_proxy
+
+AZURE_LOCATION = "eastus"
+
+
+@pytest.mark.skip("you may need to update the auto-generated test case before run it")
+class TestStorageManagementManagementPoliciesOperations(AzureMgmtRecordedTestCase):
+    def setup_method(self, method):
+        self.client = self.create_mgmt_client(StorageManagementClient)
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_management_policies_get(self, resource_group):
+        response = self.client.management_policies.get(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            management_policy_name="str",
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_management_policies_create_or_update(self, resource_group):
+        response = self.client.management_policies.create_or_update(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            management_policy_name="str",
+            properties={
+                "id": "str",
+                "lastModifiedTime": "2020-02-20 00:00:00",
+                "name": "str",
+                "policy": {
+                    "rules": [
+                        {
+                            "definition": {
+                                "actions": {
+                                    "baseBlob": {
+                                        "delete": {
+                                            "daysAfterCreationGreaterThan": 0.0,
+                                            "daysAfterLastAccessTimeGreaterThan": 0.0,
+                                            "daysAfterLastTierChangeGreaterThan": 0.0,
+                                            "daysAfterModificationGreaterThan": 0.0,
+                                        },
+                                        "enableAutoTierToHotFromCool": bool,
+                                        "tierToArchive": {
+                                            "daysAfterCreationGreaterThan": 0.0,
+                                            "daysAfterLastAccessTimeGreaterThan": 0.0,
+                                            "daysAfterLastTierChangeGreaterThan": 0.0,
+                                            "daysAfterModificationGreaterThan": 0.0,
+                                        },
+                                        "tierToCold": {
+                                            "daysAfterCreationGreaterThan": 0.0,
+                                            "daysAfterLastAccessTimeGreaterThan": 0.0,
+                                            "daysAfterLastTierChangeGreaterThan": 0.0,
+                                            "daysAfterModificationGreaterThan": 0.0,
+                                        },
+                                        "tierToCool": {
+                                            "daysAfterCreationGreaterThan": 0.0,
+                                            "daysAfterLastAccessTimeGreaterThan": 0.0,
+                                            "daysAfterLastTierChangeGreaterThan": 0.0,
+                                            "daysAfterModificationGreaterThan": 0.0,
+                                        },
+                                        "tierToHot": {
+                                            "daysAfterCreationGreaterThan": 0.0,
+                                            "daysAfterLastAccessTimeGreaterThan": 0.0,
+                                            "daysAfterLastTierChangeGreaterThan": 0.0,
+                                            "daysAfterModificationGreaterThan": 0.0,
+                                        },
+                                    },
+                                    "snapshot": {
+                                        "delete": {
+                                            "daysAfterCreationGreaterThan": 0.0,
+                                            "daysAfterLastTierChangeGreaterThan": 0.0,
+                                        },
+                                        "tierToArchive": {
+                                            "daysAfterCreationGreaterThan": 0.0,
+                                            "daysAfterLastTierChangeGreaterThan": 0.0,
+                                        },
+                                        "tierToCold": {
+                                            "daysAfterCreationGreaterThan": 0.0,
+                                            "daysAfterLastTierChangeGreaterThan": 0.0,
+                                        },
+                                        "tierToCool": {
+                                            "daysAfterCreationGreaterThan": 0.0,
+                                            "daysAfterLastTierChangeGreaterThan": 0.0,
+                                        },
+                                        "tierToHot": {
+                                            "daysAfterCreationGreaterThan": 0.0,
+                                            "daysAfterLastTierChangeGreaterThan": 0.0,
+                                        },
+                                    },
+                                    "version": {
+                                        "delete": {
+                                            "daysAfterCreationGreaterThan": 0.0,
+                                            "daysAfterLastTierChangeGreaterThan": 0.0,
+                                        },
+                                        "tierToArchive": {
+                                            "daysAfterCreationGreaterThan": 0.0,
+                                            "daysAfterLastTierChangeGreaterThan": 0.0,
+                                        },
+                                        "tierToCold": {
+                                            "daysAfterCreationGreaterThan": 0.0,
+                                            "daysAfterLastTierChangeGreaterThan": 0.0,
+                                        },
+                                        "tierToCool": {
+                                            "daysAfterCreationGreaterThan": 0.0,
+                                            "daysAfterLastTierChangeGreaterThan": 0.0,
+                                        },
+                                        "tierToHot": {
+                                            "daysAfterCreationGreaterThan": 0.0,
+                                            "daysAfterLastTierChangeGreaterThan": 0.0,
+                                        },
+                                    },
+                                },
+                                "filters": {
+                                    "blobTypes": ["str"],
+                                    "blobIndexMatch": [{"name": "str", "op": "str", "value": "str"}],
+                                    "prefixMatch": ["str"],
+                                },
+                            },
+                            "name": "str",
+                            "type": "str",
+                            "enabled": bool,
+                        }
+                    ]
+                },
+                "type": "str",
+            },
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_management_policies_delete(self, resource_group):
+        response = self.client.management_policies.delete(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            management_policy_name="str",
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
diff --git a/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_management_policies_operations_async.py b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_management_policies_operations_async.py
new file mode 100644
index 000000000000..564b8780d25a
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_management_policies_operations_async.py
@@ -0,0 +1,160 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+import pytest
+from azure.mgmt.storage.aio import StorageManagementClient
+
+from devtools_testutils import AzureMgmtRecordedTestCase, RandomNameResourceGroupPreparer
+from devtools_testutils.aio import recorded_by_proxy_async
+
+AZURE_LOCATION = "eastus"
+
+
+@pytest.mark.skip("you may need to update the auto-generated test case before run it")
+class TestStorageManagementManagementPoliciesOperationsAsync(AzureMgmtRecordedTestCase):
+    def setup_method(self, method):
+        self.client = self.create_mgmt_client(StorageManagementClient, is_async=True)
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_management_policies_get(self, resource_group):
+        response = await self.client.management_policies.get(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            management_policy_name="str",
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_management_policies_create_or_update(self, resource_group):
+        response = await self.client.management_policies.create_or_update(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            management_policy_name="str",
+            properties={
+                "id": "str",
+                "lastModifiedTime": "2020-02-20 00:00:00",
+                "name": "str",
+                "policy": {
+                    "rules": [
+                        {
+                            "definition": {
+                                "actions": {
+                                    "baseBlob": {
+                                        "delete": {
+                                            "daysAfterCreationGreaterThan": 0.0,
+                                            "daysAfterLastAccessTimeGreaterThan": 0.0,
+                                            "daysAfterLastTierChangeGreaterThan": 0.0,
+                                            "daysAfterModificationGreaterThan": 0.0,
+                                        },
+                                        "enableAutoTierToHotFromCool": bool,
+                                        "tierToArchive": {
+                                            "daysAfterCreationGreaterThan": 0.0,
+                                            "daysAfterLastAccessTimeGreaterThan": 0.0,
+                                            "daysAfterLastTierChangeGreaterThan": 0.0,
+                                            "daysAfterModificationGreaterThan": 0.0,
+                                        },
+                                        "tierToCold": {
+                                            "daysAfterCreationGreaterThan": 0.0,
+                                            "daysAfterLastAccessTimeGreaterThan": 0.0,
+                                            "daysAfterLastTierChangeGreaterThan": 0.0,
+                                            "daysAfterModificationGreaterThan": 0.0,
+                                        },
+                                        "tierToCool": {
+                                            "daysAfterCreationGreaterThan": 0.0,
+                                            "daysAfterLastAccessTimeGreaterThan": 0.0,
+                                            "daysAfterLastTierChangeGreaterThan": 0.0,
+                                            "daysAfterModificationGreaterThan": 0.0,
+                                        },
+                                        "tierToHot": {
+                                            "daysAfterCreationGreaterThan": 0.0,
+                                            "daysAfterLastAccessTimeGreaterThan": 0.0,
+                                            "daysAfterLastTierChangeGreaterThan": 0.0,
+                                            "daysAfterModificationGreaterThan": 0.0,
+                                        },
+                                    },
+                                    "snapshot": {
+                                        "delete": {
+                                            "daysAfterCreationGreaterThan": 0.0,
+                                            "daysAfterLastTierChangeGreaterThan": 0.0,
+                                        },
+                                        "tierToArchive": {
+                                            "daysAfterCreationGreaterThan": 0.0,
+                                            "daysAfterLastTierChangeGreaterThan": 0.0,
+                                        },
+                                        "tierToCold": {
+                                            "daysAfterCreationGreaterThan": 0.0,
+                                            "daysAfterLastTierChangeGreaterThan": 0.0,
+                                        },
+                                        "tierToCool": {
+                                            "daysAfterCreationGreaterThan": 0.0,
+                                            "daysAfterLastTierChangeGreaterThan": 0.0,
+                                        },
+                                        "tierToHot": {
+                                            "daysAfterCreationGreaterThan": 0.0,
+                                            "daysAfterLastTierChangeGreaterThan": 0.0,
+                                        },
+                                    },
+                                    "version": {
+                                        "delete": {
+                                            "daysAfterCreationGreaterThan": 0.0,
+                                            "daysAfterLastTierChangeGreaterThan": 0.0,
+                                        },
+                                        "tierToArchive": {
+                                            "daysAfterCreationGreaterThan": 0.0,
+                                            "daysAfterLastTierChangeGreaterThan": 0.0,
+                                        },
+                                        "tierToCold": {
+                                            "daysAfterCreationGreaterThan": 0.0,
+                                            "daysAfterLastTierChangeGreaterThan": 0.0,
+                                        },
+                                        "tierToCool": {
+                                            "daysAfterCreationGreaterThan": 0.0,
+                                            "daysAfterLastTierChangeGreaterThan": 0.0,
+                                        },
+                                        "tierToHot": {
+                                            "daysAfterCreationGreaterThan": 0.0,
+                                            "daysAfterLastTierChangeGreaterThan": 0.0,
+                                        },
+                                    },
+                                },
+                                "filters": {
+                                    "blobTypes": ["str"],
+                                    "blobIndexMatch": [{"name": "str", "op": "str", "value": "str"}],
+                                    "prefixMatch": ["str"],
+                                },
+                            },
+                            "name": "str",
+                            "type": "str",
+                            "enabled": bool,
+                        }
+                    ]
+                },
+                "type": "str",
+            },
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_management_policies_delete(self, resource_group):
+        response = await self.client.management_policies.delete(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            management_policy_name="str",
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
diff --git a/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_network_security_perimeter_configurations_operations.py b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_network_security_perimeter_configurations_operations.py
new file mode 100644
index 000000000000..c17ab03dc7b9
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_network_security_perimeter_configurations_operations.py
@@ -0,0 +1,57 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+import pytest
+from azure.mgmt.storage import StorageManagementClient
+
+from devtools_testutils import AzureMgmtRecordedTestCase, RandomNameResourceGroupPreparer, recorded_by_proxy
+
+AZURE_LOCATION = "eastus"
+
+
+@pytest.mark.skip("you may need to update the auto-generated test case before run it")
+class TestStorageManagementNetworkSecurityPerimeterConfigurationsOperations(AzureMgmtRecordedTestCase):
+    def setup_method(self, method):
+        self.client = self.create_mgmt_client(StorageManagementClient)
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_network_security_perimeter_configurations_list(self, resource_group):
+        response = self.client.network_security_perimeter_configurations.list(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            api_version="2024-01-01",
+        )
+        result = [r for r in response]
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_network_security_perimeter_configurations_get(self, resource_group):
+        response = self.client.network_security_perimeter_configurations.get(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            network_security_perimeter_configuration_name="str",
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_network_security_perimeter_configurations_begin_reconcile(self, resource_group):
+        response = self.client.network_security_perimeter_configurations.begin_reconcile(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            network_security_perimeter_configuration_name="str",
+            api_version="2024-01-01",
+        ).result()  # call '.result()' to poll until service return final result
+
+        # please add some check logic here by yourself
+        # ...
diff --git a/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_network_security_perimeter_configurations_operations_async.py b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_network_security_perimeter_configurations_operations_async.py
new file mode 100644
index 000000000000..a84a08b0728b
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_network_security_perimeter_configurations_operations_async.py
@@ -0,0 +1,60 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+import pytest
+from azure.mgmt.storage.aio import StorageManagementClient
+
+from devtools_testutils import AzureMgmtRecordedTestCase, RandomNameResourceGroupPreparer
+from devtools_testutils.aio import recorded_by_proxy_async
+
+AZURE_LOCATION = "eastus"
+
+
+@pytest.mark.skip("you may need to update the auto-generated test case before run it")
+class TestStorageManagementNetworkSecurityPerimeterConfigurationsOperationsAsync(AzureMgmtRecordedTestCase):
+    def setup_method(self, method):
+        self.client = self.create_mgmt_client(StorageManagementClient, is_async=True)
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_network_security_perimeter_configurations_list(self, resource_group):
+        response = self.client.network_security_perimeter_configurations.list(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            api_version="2024-01-01",
+        )
+        result = [r async for r in response]
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_network_security_perimeter_configurations_get(self, resource_group):
+        response = await self.client.network_security_perimeter_configurations.get(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            network_security_perimeter_configuration_name="str",
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_network_security_perimeter_configurations_begin_reconcile(self, resource_group):
+        response = await (
+            await self.client.network_security_perimeter_configurations.begin_reconcile(
+                resource_group_name=resource_group.name,
+                account_name="str",
+                network_security_perimeter_configuration_name="str",
+                api_version="2024-01-01",
+            )
+        ).result()  # call '.result()' to poll until service return final result
+
+        # please add some check logic here by yourself
+        # ...
diff --git a/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_object_replication_policies_operations.py b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_object_replication_policies_operations.py
new file mode 100644
index 000000000000..19570d67272c
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_object_replication_policies_operations.py
@@ -0,0 +1,88 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+import pytest
+from azure.mgmt.storage import StorageManagementClient
+
+from devtools_testutils import AzureMgmtRecordedTestCase, RandomNameResourceGroupPreparer, recorded_by_proxy
+
+AZURE_LOCATION = "eastus"
+
+
+@pytest.mark.skip("you may need to update the auto-generated test case before run it")
+class TestStorageManagementObjectReplicationPoliciesOperations(AzureMgmtRecordedTestCase):
+    def setup_method(self, method):
+        self.client = self.create_mgmt_client(StorageManagementClient)
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_object_replication_policies_list(self, resource_group):
+        response = self.client.object_replication_policies.list(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            api_version="2024-01-01",
+        )
+        result = [r for r in response]
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_object_replication_policies_get(self, resource_group):
+        response = self.client.object_replication_policies.get(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            object_replication_policy_id="str",
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_object_replication_policies_create_or_update(self, resource_group):
+        response = self.client.object_replication_policies.create_or_update(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            object_replication_policy_id="str",
+            properties={
+                "destinationAccount": "str",
+                "enabledTime": "2020-02-20 00:00:00",
+                "id": "str",
+                "metrics": {"enabled": bool},
+                "name": "str",
+                "policyId": "str",
+                "rules": [
+                    {
+                        "destinationContainer": "str",
+                        "sourceContainer": "str",
+                        "filters": {"minCreationTime": "str", "prefixMatch": ["str"]},
+                        "ruleId": "str",
+                    }
+                ],
+                "sourceAccount": "str",
+                "type": "str",
+            },
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_object_replication_policies_delete(self, resource_group):
+        response = self.client.object_replication_policies.delete(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            object_replication_policy_id="str",
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
diff --git a/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_object_replication_policies_operations_async.py b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_object_replication_policies_operations_async.py
new file mode 100644
index 000000000000..e139100aa34a
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_object_replication_policies_operations_async.py
@@ -0,0 +1,89 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+import pytest
+from azure.mgmt.storage.aio import StorageManagementClient
+
+from devtools_testutils import AzureMgmtRecordedTestCase, RandomNameResourceGroupPreparer
+from devtools_testutils.aio import recorded_by_proxy_async
+
+AZURE_LOCATION = "eastus"
+
+
+@pytest.mark.skip("you may need to update the auto-generated test case before run it")
+class TestStorageManagementObjectReplicationPoliciesOperationsAsync(AzureMgmtRecordedTestCase):
+    def setup_method(self, method):
+        self.client = self.create_mgmt_client(StorageManagementClient, is_async=True)
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_object_replication_policies_list(self, resource_group):
+        response = self.client.object_replication_policies.list(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            api_version="2024-01-01",
+        )
+        result = [r async for r in response]
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_object_replication_policies_get(self, resource_group):
+        response = await self.client.object_replication_policies.get(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            object_replication_policy_id="str",
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_object_replication_policies_create_or_update(self, resource_group):
+        response = await self.client.object_replication_policies.create_or_update(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            object_replication_policy_id="str",
+            properties={
+                "destinationAccount": "str",
+                "enabledTime": "2020-02-20 00:00:00",
+                "id": "str",
+                "metrics": {"enabled": bool},
+                "name": "str",
+                "policyId": "str",
+                "rules": [
+                    {
+                        "destinationContainer": "str",
+                        "sourceContainer": "str",
+                        "filters": {"minCreationTime": "str", "prefixMatch": ["str"]},
+                        "ruleId": "str",
+                    }
+                ],
+                "sourceAccount": "str",
+                "type": "str",
+            },
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_object_replication_policies_delete(self, resource_group):
+        response = await self.client.object_replication_policies.delete(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            object_replication_policy_id="str",
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
diff --git a/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_operations.py b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_operations.py
new file mode 100644
index 000000000000..91487e28ef03
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_operations.py
@@ -0,0 +1,29 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+import pytest
+from azure.mgmt.storage import StorageManagementClient
+
+from devtools_testutils import AzureMgmtRecordedTestCase, RandomNameResourceGroupPreparer, recorded_by_proxy
+
+AZURE_LOCATION = "eastus"
+
+
+@pytest.mark.skip("you may need to update the auto-generated test case before run it")
+class TestStorageManagementOperations(AzureMgmtRecordedTestCase):
+    def setup_method(self, method):
+        self.client = self.create_mgmt_client(StorageManagementClient)
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_operations_list(self, resource_group):
+        response = self.client.operations.list(
+            api_version="2024-01-01",
+        )
+        result = [r for r in response]
+        # please add some check logic here by yourself
+        # ...
diff --git a/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_operations_async.py b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_operations_async.py
new file mode 100644
index 000000000000..2e73c5d5effa
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_operations_async.py
@@ -0,0 +1,30 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+import pytest
+from azure.mgmt.storage.aio import StorageManagementClient
+
+from devtools_testutils import AzureMgmtRecordedTestCase, RandomNameResourceGroupPreparer
+from devtools_testutils.aio import recorded_by_proxy_async
+
+AZURE_LOCATION = "eastus"
+
+
+@pytest.mark.skip("you may need to update the auto-generated test case before run it")
+class TestStorageManagementOperationsAsync(AzureMgmtRecordedTestCase):
+    def setup_method(self, method):
+        self.client = self.create_mgmt_client(StorageManagementClient, is_async=True)
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_operations_list(self, resource_group):
+        response = self.client.operations.list(
+            api_version="2024-01-01",
+        )
+        result = [r async for r in response]
+        # please add some check logic here by yourself
+        # ...
diff --git a/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_private_endpoint_connections_operations.py b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_private_endpoint_connections_operations.py
new file mode 100644
index 000000000000..82952f11b2ba
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_private_endpoint_connections_operations.py
@@ -0,0 +1,78 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+import pytest
+from azure.mgmt.storage import StorageManagementClient
+
+from devtools_testutils import AzureMgmtRecordedTestCase, RandomNameResourceGroupPreparer, recorded_by_proxy
+
+AZURE_LOCATION = "eastus"
+
+
+@pytest.mark.skip("you may need to update the auto-generated test case before run it")
+class TestStorageManagementPrivateEndpointConnectionsOperations(AzureMgmtRecordedTestCase):
+    def setup_method(self, method):
+        self.client = self.create_mgmt_client(StorageManagementClient)
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_private_endpoint_connections_list(self, resource_group):
+        response = self.client.private_endpoint_connections.list(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            api_version="2024-01-01",
+        )
+        result = [r for r in response]
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_private_endpoint_connections_get(self, resource_group):
+        response = self.client.private_endpoint_connections.get(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            private_endpoint_connection_name="str",
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_private_endpoint_connections_put(self, resource_group):
+        response = self.client.private_endpoint_connections.put(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            private_endpoint_connection_name="str",
+            properties={
+                "id": "str",
+                "name": "str",
+                "privateEndpoint": {"id": "str"},
+                "privateLinkServiceConnectionState": {"actionRequired": "str", "description": "str", "status": "str"},
+                "provisioningState": "str",
+                "type": "str",
+            },
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_private_endpoint_connections_delete(self, resource_group):
+        response = self.client.private_endpoint_connections.delete(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            private_endpoint_connection_name="str",
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
diff --git a/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_private_endpoint_connections_operations_async.py b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_private_endpoint_connections_operations_async.py
new file mode 100644
index 000000000000..447d6ec990dc
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_private_endpoint_connections_operations_async.py
@@ -0,0 +1,79 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+import pytest
+from azure.mgmt.storage.aio import StorageManagementClient
+
+from devtools_testutils import AzureMgmtRecordedTestCase, RandomNameResourceGroupPreparer
+from devtools_testutils.aio import recorded_by_proxy_async
+
+AZURE_LOCATION = "eastus"
+
+
+@pytest.mark.skip("you may need to update the auto-generated test case before run it")
+class TestStorageManagementPrivateEndpointConnectionsOperationsAsync(AzureMgmtRecordedTestCase):
+    def setup_method(self, method):
+        self.client = self.create_mgmt_client(StorageManagementClient, is_async=True)
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_private_endpoint_connections_list(self, resource_group):
+        response = self.client.private_endpoint_connections.list(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            api_version="2024-01-01",
+        )
+        result = [r async for r in response]
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_private_endpoint_connections_get(self, resource_group):
+        response = await self.client.private_endpoint_connections.get(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            private_endpoint_connection_name="str",
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_private_endpoint_connections_put(self, resource_group):
+        response = await self.client.private_endpoint_connections.put(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            private_endpoint_connection_name="str",
+            properties={
+                "id": "str",
+                "name": "str",
+                "privateEndpoint": {"id": "str"},
+                "privateLinkServiceConnectionState": {"actionRequired": "str", "description": "str", "status": "str"},
+                "provisioningState": "str",
+                "type": "str",
+            },
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_private_endpoint_connections_delete(self, resource_group):
+        response = await self.client.private_endpoint_connections.delete(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            private_endpoint_connection_name="str",
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
diff --git a/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_private_link_resources_operations.py b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_private_link_resources_operations.py
new file mode 100644
index 000000000000..56da160e3620
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_private_link_resources_operations.py
@@ -0,0 +1,31 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+import pytest
+from azure.mgmt.storage import StorageManagementClient
+
+from devtools_testutils import AzureMgmtRecordedTestCase, RandomNameResourceGroupPreparer, recorded_by_proxy
+
+AZURE_LOCATION = "eastus"
+
+
+@pytest.mark.skip("you may need to update the auto-generated test case before run it")
+class TestStorageManagementPrivateLinkResourcesOperations(AzureMgmtRecordedTestCase):
+    def setup_method(self, method):
+        self.client = self.create_mgmt_client(StorageManagementClient)
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_private_link_resources_list_by_storage_account(self, resource_group):
+        response = self.client.private_link_resources.list_by_storage_account(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
diff --git a/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_private_link_resources_operations_async.py b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_private_link_resources_operations_async.py
new file mode 100644
index 000000000000..c55345e4b271
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_private_link_resources_operations_async.py
@@ -0,0 +1,32 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+import pytest
+from azure.mgmt.storage.aio import StorageManagementClient
+
+from devtools_testutils import AzureMgmtRecordedTestCase, RandomNameResourceGroupPreparer
+from devtools_testutils.aio import recorded_by_proxy_async
+
+AZURE_LOCATION = "eastus"
+
+
+@pytest.mark.skip("you may need to update the auto-generated test case before run it")
+class TestStorageManagementPrivateLinkResourcesOperationsAsync(AzureMgmtRecordedTestCase):
+    def setup_method(self, method):
+        self.client = self.create_mgmt_client(StorageManagementClient, is_async=True)
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_private_link_resources_list_by_storage_account(self, resource_group):
+        response = await self.client.private_link_resources.list_by_storage_account(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
diff --git a/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_queue_operations.py b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_queue_operations.py
new file mode 100644
index 000000000000..d16c283b2aeb
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_queue_operations.py
@@ -0,0 +1,85 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+import pytest
+from azure.mgmt.storage import StorageManagementClient
+
+from devtools_testutils import AzureMgmtRecordedTestCase, RandomNameResourceGroupPreparer, recorded_by_proxy
+
+AZURE_LOCATION = "eastus"
+
+
+@pytest.mark.skip("you may need to update the auto-generated test case before run it")
+class TestStorageManagementQueueOperations(AzureMgmtRecordedTestCase):
+    def setup_method(self, method):
+        self.client = self.create_mgmt_client(StorageManagementClient)
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_queue_create(self, resource_group):
+        response = self.client.queue.create(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            queue_name="str",
+            queue={"approximateMessageCount": 0, "id": "str", "metadata": {"str": "str"}, "name": "str", "type": "str"},
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_queue_update(self, resource_group):
+        response = self.client.queue.update(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            queue_name="str",
+            queue={"approximateMessageCount": 0, "id": "str", "metadata": {"str": "str"}, "name": "str", "type": "str"},
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_queue_get(self, resource_group):
+        response = self.client.queue.get(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            queue_name="str",
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_queue_delete(self, resource_group):
+        response = self.client.queue.delete(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            queue_name="str",
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_queue_list(self, resource_group):
+        response = self.client.queue.list(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            api_version="2024-01-01",
+        )
+        result = [r for r in response]
+        # please add some check logic here by yourself
+        # ...
diff --git a/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_queue_operations_async.py b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_queue_operations_async.py
new file mode 100644
index 000000000000..852aaea1e1d2
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_queue_operations_async.py
@@ -0,0 +1,86 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+import pytest
+from azure.mgmt.storage.aio import StorageManagementClient
+
+from devtools_testutils import AzureMgmtRecordedTestCase, RandomNameResourceGroupPreparer
+from devtools_testutils.aio import recorded_by_proxy_async
+
+AZURE_LOCATION = "eastus"
+
+
+@pytest.mark.skip("you may need to update the auto-generated test case before run it")
+class TestStorageManagementQueueOperationsAsync(AzureMgmtRecordedTestCase):
+    def setup_method(self, method):
+        self.client = self.create_mgmt_client(StorageManagementClient, is_async=True)
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_queue_create(self, resource_group):
+        response = await self.client.queue.create(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            queue_name="str",
+            queue={"approximateMessageCount": 0, "id": "str", "metadata": {"str": "str"}, "name": "str", "type": "str"},
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_queue_update(self, resource_group):
+        response = await self.client.queue.update(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            queue_name="str",
+            queue={"approximateMessageCount": 0, "id": "str", "metadata": {"str": "str"}, "name": "str", "type": "str"},
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_queue_get(self, resource_group):
+        response = await self.client.queue.get(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            queue_name="str",
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_queue_delete(self, resource_group):
+        response = await self.client.queue.delete(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            queue_name="str",
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_queue_list(self, resource_group):
+        response = self.client.queue.list(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            api_version="2024-01-01",
+        )
+        result = [r async for r in response]
+        # please add some check logic here by yourself
+        # ...
diff --git a/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_queue_services_operations.py b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_queue_services_operations.py
new file mode 100644
index 000000000000..2bb2671d78c6
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_queue_services_operations.py
@@ -0,0 +1,73 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+import pytest
+from azure.mgmt.storage import StorageManagementClient
+
+from devtools_testutils import AzureMgmtRecordedTestCase, RandomNameResourceGroupPreparer, recorded_by_proxy
+
+AZURE_LOCATION = "eastus"
+
+
+@pytest.mark.skip("you may need to update the auto-generated test case before run it")
+class TestStorageManagementQueueServicesOperations(AzureMgmtRecordedTestCase):
+    def setup_method(self, method):
+        self.client = self.create_mgmt_client(StorageManagementClient)
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_queue_services_list(self, resource_group):
+        response = self.client.queue_services.list(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_queue_services_set_service_properties(self, resource_group):
+        response = self.client.queue_services.set_service_properties(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            parameters={
+                "cors": {
+                    "corsRules": [
+                        {
+                            "allowedHeaders": ["str"],
+                            "allowedMethods": ["str"],
+                            "allowedOrigins": ["str"],
+                            "exposedHeaders": ["str"],
+                            "maxAgeInSeconds": 0,
+                        }
+                    ]
+                },
+                "id": "str",
+                "name": "str",
+                "type": "str",
+            },
+            api_version="2024-01-01",
+            queue_service_name="default",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_queue_services_get_service_properties(self, resource_group):
+        response = self.client.queue_services.get_service_properties(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            api_version="2024-01-01",
+            queue_service_name="default",
+        )
+
+        # please add some check logic here by yourself
+        # ...
diff --git a/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_queue_services_operations_async.py b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_queue_services_operations_async.py
new file mode 100644
index 000000000000..710db353af96
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_queue_services_operations_async.py
@@ -0,0 +1,74 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+import pytest
+from azure.mgmt.storage.aio import StorageManagementClient
+
+from devtools_testutils import AzureMgmtRecordedTestCase, RandomNameResourceGroupPreparer
+from devtools_testutils.aio import recorded_by_proxy_async
+
+AZURE_LOCATION = "eastus"
+
+
+@pytest.mark.skip("you may need to update the auto-generated test case before run it")
+class TestStorageManagementQueueServicesOperationsAsync(AzureMgmtRecordedTestCase):
+    def setup_method(self, method):
+        self.client = self.create_mgmt_client(StorageManagementClient, is_async=True)
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_queue_services_list(self, resource_group):
+        response = await self.client.queue_services.list(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_queue_services_set_service_properties(self, resource_group):
+        response = await self.client.queue_services.set_service_properties(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            parameters={
+                "cors": {
+                    "corsRules": [
+                        {
+                            "allowedHeaders": ["str"],
+                            "allowedMethods": ["str"],
+                            "allowedOrigins": ["str"],
+                            "exposedHeaders": ["str"],
+                            "maxAgeInSeconds": 0,
+                        }
+                    ]
+                },
+                "id": "str",
+                "name": "str",
+                "type": "str",
+            },
+            api_version="2024-01-01",
+            queue_service_name="default",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_queue_services_get_service_properties(self, resource_group):
+        response = await self.client.queue_services.get_service_properties(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            api_version="2024-01-01",
+            queue_service_name="default",
+        )
+
+        # please add some check logic here by yourself
+        # ...
diff --git a/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_skus_operations.py b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_skus_operations.py
new file mode 100644
index 000000000000..4e89953d0abb
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_skus_operations.py
@@ -0,0 +1,29 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+import pytest
+from azure.mgmt.storage import StorageManagementClient
+
+from devtools_testutils import AzureMgmtRecordedTestCase, RandomNameResourceGroupPreparer, recorded_by_proxy
+
+AZURE_LOCATION = "eastus"
+
+
+@pytest.mark.skip("you may need to update the auto-generated test case before run it")
+class TestStorageManagementSkusOperations(AzureMgmtRecordedTestCase):
+    def setup_method(self, method):
+        self.client = self.create_mgmt_client(StorageManagementClient)
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_skus_list(self, resource_group):
+        response = self.client.skus.list(
+            api_version="2024-01-01",
+        )
+        result = [r for r in response]
+        # please add some check logic here by yourself
+        # ...
diff --git a/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_skus_operations_async.py b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_skus_operations_async.py
new file mode 100644
index 000000000000..0ff248c2f97e
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_skus_operations_async.py
@@ -0,0 +1,30 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+import pytest
+from azure.mgmt.storage.aio import StorageManagementClient
+
+from devtools_testutils import AzureMgmtRecordedTestCase, RandomNameResourceGroupPreparer
+from devtools_testutils.aio import recorded_by_proxy_async
+
+AZURE_LOCATION = "eastus"
+
+
+@pytest.mark.skip("you may need to update the auto-generated test case before run it")
+class TestStorageManagementSkusOperationsAsync(AzureMgmtRecordedTestCase):
+    def setup_method(self, method):
+        self.client = self.create_mgmt_client(StorageManagementClient, is_async=True)
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_skus_list(self, resource_group):
+        response = self.client.skus.list(
+            api_version="2024-01-01",
+        )
+        result = [r async for r in response]
+        # please add some check logic here by yourself
+        # ...
diff --git a/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_storage_accounts_operations.py b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_storage_accounts_operations.py
new file mode 100644
index 000000000000..00fd403d313d
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_storage_accounts_operations.py
@@ -0,0 +1,443 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+import pytest
+from azure.mgmt.storage import StorageManagementClient
+
+from devtools_testutils import AzureMgmtRecordedTestCase, RandomNameResourceGroupPreparer, recorded_by_proxy
+
+AZURE_LOCATION = "eastus"
+
+
+@pytest.mark.skip("you may need to update the auto-generated test case before run it")
+class TestStorageManagementStorageAccountsOperations(AzureMgmtRecordedTestCase):
+    def setup_method(self, method):
+        self.client = self.create_mgmt_client(StorageManagementClient)
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_storage_accounts_check_name_availability(self, resource_group):
+        response = self.client.storage_accounts.check_name_availability(
+            account_name={"name": "str", "type": "Microsoft.Storage/storageAccounts"},
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_storage_accounts_begin_create(self, resource_group):
+        response = self.client.storage_accounts.begin_create(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            parameters={
+                "kind": "str",
+                "location": "str",
+                "sku": {"name": "str", "tier": "str"},
+                "accessTier": "str",
+                "allowBlobPublicAccess": bool,
+                "allowCrossTenantReplication": bool,
+                "allowSharedKeyAccess": bool,
+                "allowedCopyScope": "str",
+                "azureFilesIdentityBasedAuthentication": {
+                    "directoryServiceOptions": "str",
+                    "activeDirectoryProperties": {
+                        "domainGuid": "str",
+                        "domainName": "str",
+                        "accountType": "str",
+                        "azureStorageSid": "str",
+                        "domainSid": "str",
+                        "forestName": "str",
+                        "netBiosDomainName": "str",
+                        "samAccountName": "str",
+                    },
+                    "defaultSharePermission": "str",
+                },
+                "customDomain": {"name": "str", "useSubDomainName": bool},
+                "defaultToOAuthAuthentication": bool,
+                "dnsEndpointType": "str",
+                "enableExtendedGroups": bool,
+                "encryption": {
+                    "identity": {"federatedIdentityClientId": "str", "userAssignedIdentity": "str"},
+                    "keySource": "Microsoft.Storage",
+                    "keyvaultproperties": {
+                        "currentVersionedKeyExpirationTimestamp": "2020-02-20 00:00:00",
+                        "currentVersionedKeyIdentifier": "str",
+                        "keyname": "str",
+                        "keyvaulturi": "str",
+                        "keyversion": "str",
+                        "lastKeyRotationTimestamp": "2020-02-20 00:00:00",
+                    },
+                    "requireInfrastructureEncryption": bool,
+                    "services": {
+                        "blob": {"enabled": bool, "keyType": "str", "lastEnabledTime": "2020-02-20 00:00:00"},
+                        "file": {"enabled": bool, "keyType": "str", "lastEnabledTime": "2020-02-20 00:00:00"},
+                        "queue": {"enabled": bool, "keyType": "str", "lastEnabledTime": "2020-02-20 00:00:00"},
+                        "table": {"enabled": bool, "keyType": "str", "lastEnabledTime": "2020-02-20 00:00:00"},
+                    },
+                },
+                "extendedLocation": {"name": "str", "type": "str"},
+                "identity": {
+                    "type": "str",
+                    "principalId": "str",
+                    "tenantId": "str",
+                    "userAssignedIdentities": {"str": {"clientId": "str", "principalId": "str"}},
+                },
+                "immutableStorageWithVersioning": {
+                    "enabled": bool,
+                    "immutabilityPolicy": {
+                        "allowProtectedAppendWrites": bool,
+                        "immutabilityPeriodSinceCreationInDays": 0,
+                        "state": "str",
+                    },
+                },
+                "isHnsEnabled": bool,
+                "isLocalUserEnabled": bool,
+                "isNfsV3Enabled": bool,
+                "isSftpEnabled": bool,
+                "keyPolicy": {"keyExpirationPeriodInDays": 0},
+                "largeFileSharesState": "str",
+                "minimumTlsVersion": "str",
+                "networkAcls": {
+                    "defaultAction": "Allow",
+                    "bypass": "AzureServices",
+                    "ipRules": [{"value": "str", "action": "Allow"}],
+                    "resourceAccessRules": [{"resourceId": "str", "tenantId": "str"}],
+                    "virtualNetworkRules": [{"id": "str", "action": "Allow", "state": "str"}],
+                },
+                "publicNetworkAccess": "str",
+                "routingPreference": {
+                    "publishInternetEndpoints": bool,
+                    "publishMicrosoftEndpoints": bool,
+                    "routingChoice": "str",
+                },
+                "sasPolicy": {"expirationAction": "Log", "sasExpirationPeriod": "str"},
+                "supportsHttpsTrafficOnly": bool,
+                "tags": {"str": "str"},
+            },
+            api_version="2024-01-01",
+        ).result()  # call '.result()' to poll until service return final result
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_storage_accounts_delete(self, resource_group):
+        response = self.client.storage_accounts.delete(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_storage_accounts_get_properties(self, resource_group):
+        response = self.client.storage_accounts.get_properties(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_storage_accounts_update(self, resource_group):
+        response = self.client.storage_accounts.update(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            parameters={
+                "accessTier": "str",
+                "allowBlobPublicAccess": bool,
+                "allowCrossTenantReplication": bool,
+                "allowSharedKeyAccess": bool,
+                "allowedCopyScope": "str",
+                "azureFilesIdentityBasedAuthentication": {
+                    "directoryServiceOptions": "str",
+                    "activeDirectoryProperties": {
+                        "domainGuid": "str",
+                        "domainName": "str",
+                        "accountType": "str",
+                        "azureStorageSid": "str",
+                        "domainSid": "str",
+                        "forestName": "str",
+                        "netBiosDomainName": "str",
+                        "samAccountName": "str",
+                    },
+                    "defaultSharePermission": "str",
+                },
+                "customDomain": {"name": "str", "useSubDomainName": bool},
+                "defaultToOAuthAuthentication": bool,
+                "dnsEndpointType": "str",
+                "enableExtendedGroups": bool,
+                "encryption": {
+                    "identity": {"federatedIdentityClientId": "str", "userAssignedIdentity": "str"},
+                    "keySource": "Microsoft.Storage",
+                    "keyvaultproperties": {
+                        "currentVersionedKeyExpirationTimestamp": "2020-02-20 00:00:00",
+                        "currentVersionedKeyIdentifier": "str",
+                        "keyname": "str",
+                        "keyvaulturi": "str",
+                        "keyversion": "str",
+                        "lastKeyRotationTimestamp": "2020-02-20 00:00:00",
+                    },
+                    "requireInfrastructureEncryption": bool,
+                    "services": {
+                        "blob": {"enabled": bool, "keyType": "str", "lastEnabledTime": "2020-02-20 00:00:00"},
+                        "file": {"enabled": bool, "keyType": "str", "lastEnabledTime": "2020-02-20 00:00:00"},
+                        "queue": {"enabled": bool, "keyType": "str", "lastEnabledTime": "2020-02-20 00:00:00"},
+                        "table": {"enabled": bool, "keyType": "str", "lastEnabledTime": "2020-02-20 00:00:00"},
+                    },
+                },
+                "identity": {
+                    "type": "str",
+                    "principalId": "str",
+                    "tenantId": "str",
+                    "userAssignedIdentities": {"str": {"clientId": "str", "principalId": "str"}},
+                },
+                "immutableStorageWithVersioning": {
+                    "enabled": bool,
+                    "immutabilityPolicy": {
+                        "allowProtectedAppendWrites": bool,
+                        "immutabilityPeriodSinceCreationInDays": 0,
+                        "state": "str",
+                    },
+                },
+                "isLocalUserEnabled": bool,
+                "isSftpEnabled": bool,
+                "keyPolicy": {"keyExpirationPeriodInDays": 0},
+                "kind": "str",
+                "largeFileSharesState": "str",
+                "minimumTlsVersion": "str",
+                "networkAcls": {
+                    "defaultAction": "Allow",
+                    "bypass": "AzureServices",
+                    "ipRules": [{"value": "str", "action": "Allow"}],
+                    "resourceAccessRules": [{"resourceId": "str", "tenantId": "str"}],
+                    "virtualNetworkRules": [{"id": "str", "action": "Allow", "state": "str"}],
+                },
+                "publicNetworkAccess": "str",
+                "routingPreference": {
+                    "publishInternetEndpoints": bool,
+                    "publishMicrosoftEndpoints": bool,
+                    "routingChoice": "str",
+                },
+                "sasPolicy": {"expirationAction": "Log", "sasExpirationPeriod": "str"},
+                "sku": {"name": "str", "tier": "str"},
+                "supportsHttpsTrafficOnly": bool,
+                "tags": {"str": "str"},
+            },
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_storage_accounts_list(self, resource_group):
+        response = self.client.storage_accounts.list(
+            api_version="2024-01-01",
+        )
+        result = [r for r in response]
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_storage_accounts_list_by_resource_group(self, resource_group):
+        response = self.client.storage_accounts.list_by_resource_group(
+            resource_group_name=resource_group.name,
+            api_version="2024-01-01",
+        )
+        result = [r for r in response]
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_storage_accounts_list_keys(self, resource_group):
+        response = self.client.storage_accounts.list_keys(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_storage_accounts_regenerate_key(self, resource_group):
+        response = self.client.storage_accounts.regenerate_key(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            regenerate_key={"keyName": "str"},
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_storage_accounts_list_account_sas(self, resource_group):
+        response = self.client.storage_accounts.list_account_sas(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            parameters={
+                "signedExpiry": "2020-02-20 00:00:00",
+                "signedPermission": "str",
+                "signedResourceTypes": "str",
+                "signedServices": "str",
+                "keyToSign": "str",
+                "signedIp": "str",
+                "signedProtocol": "str",
+                "signedStart": "2020-02-20 00:00:00",
+            },
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_storage_accounts_list_service_sas(self, resource_group):
+        response = self.client.storage_accounts.list_service_sas(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            parameters={
+                "canonicalizedResource": "str",
+                "endPk": "str",
+                "endRk": "str",
+                "keyToSign": "str",
+                "rscc": "str",
+                "rscd": "str",
+                "rsce": "str",
+                "rscl": "str",
+                "rsct": "str",
+                "signedExpiry": "2020-02-20 00:00:00",
+                "signedIdentifier": "str",
+                "signedIp": "str",
+                "signedPermission": "str",
+                "signedProtocol": "str",
+                "signedResource": "str",
+                "signedStart": "2020-02-20 00:00:00",
+                "startPk": "str",
+                "startRk": "str",
+            },
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_storage_accounts_begin_failover(self, resource_group):
+        response = self.client.storage_accounts.begin_failover(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            api_version="2024-01-01",
+        ).result()  # call '.result()' to poll until service return final result
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_storage_accounts_begin_hierarchical_namespace_migration(self, resource_group):
+        response = self.client.storage_accounts.begin_hierarchical_namespace_migration(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            request_type="str",
+            api_version="2024-01-01",
+        ).result()  # call '.result()' to poll until service return final result
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_storage_accounts_begin_abort_hierarchical_namespace_migration(self, resource_group):
+        response = self.client.storage_accounts.begin_abort_hierarchical_namespace_migration(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            api_version="2024-01-01",
+        ).result()  # call '.result()' to poll until service return final result
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_storage_accounts_begin_customer_initiated_migration(self, resource_group):
+        response = self.client.storage_accounts.begin_customer_initiated_migration(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            parameters={
+                "targetSkuName": "str",
+                "id": "str",
+                "migrationFailedDetailedReason": "str",
+                "migrationFailedReason": "str",
+                "migrationStatus": "str",
+                "name": "str",
+                "type": "str",
+            },
+            api_version="2024-01-01",
+        ).result()  # call '.result()' to poll until service return final result
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_storage_accounts_get_customer_initiated_migration(self, resource_group):
+        response = self.client.storage_accounts.get_customer_initiated_migration(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            migration_name="str",
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_storage_accounts_begin_restore_blob_ranges(self, resource_group):
+        response = self.client.storage_accounts.begin_restore_blob_ranges(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            parameters={
+                "blobRanges": [{"endRange": "str", "startRange": "str"}],
+                "timeToRestore": "2020-02-20 00:00:00",
+            },
+            api_version="2024-01-01",
+        ).result()  # call '.result()' to poll until service return final result
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_storage_accounts_revoke_user_delegation_keys(self, resource_group):
+        response = self.client.storage_accounts.revoke_user_delegation_keys(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
diff --git a/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_storage_accounts_operations_async.py b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_storage_accounts_operations_async.py
new file mode 100644
index 000000000000..6bd5d97e5034
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_storage_accounts_operations_async.py
@@ -0,0 +1,456 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+import pytest
+from azure.mgmt.storage.aio import StorageManagementClient
+
+from devtools_testutils import AzureMgmtRecordedTestCase, RandomNameResourceGroupPreparer
+from devtools_testutils.aio import recorded_by_proxy_async
+
+AZURE_LOCATION = "eastus"
+
+
+@pytest.mark.skip("you may need to update the auto-generated test case before run it")
+class TestStorageManagementStorageAccountsOperationsAsync(AzureMgmtRecordedTestCase):
+    def setup_method(self, method):
+        self.client = self.create_mgmt_client(StorageManagementClient, is_async=True)
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_storage_accounts_check_name_availability(self, resource_group):
+        response = await self.client.storage_accounts.check_name_availability(
+            account_name={"name": "str", "type": "Microsoft.Storage/storageAccounts"},
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_storage_accounts_begin_create(self, resource_group):
+        response = await (
+            await self.client.storage_accounts.begin_create(
+                resource_group_name=resource_group.name,
+                account_name="str",
+                parameters={
+                    "kind": "str",
+                    "location": "str",
+                    "sku": {"name": "str", "tier": "str"},
+                    "accessTier": "str",
+                    "allowBlobPublicAccess": bool,
+                    "allowCrossTenantReplication": bool,
+                    "allowSharedKeyAccess": bool,
+                    "allowedCopyScope": "str",
+                    "azureFilesIdentityBasedAuthentication": {
+                        "directoryServiceOptions": "str",
+                        "activeDirectoryProperties": {
+                            "domainGuid": "str",
+                            "domainName": "str",
+                            "accountType": "str",
+                            "azureStorageSid": "str",
+                            "domainSid": "str",
+                            "forestName": "str",
+                            "netBiosDomainName": "str",
+                            "samAccountName": "str",
+                        },
+                        "defaultSharePermission": "str",
+                    },
+                    "customDomain": {"name": "str", "useSubDomainName": bool},
+                    "defaultToOAuthAuthentication": bool,
+                    "dnsEndpointType": "str",
+                    "enableExtendedGroups": bool,
+                    "encryption": {
+                        "identity": {"federatedIdentityClientId": "str", "userAssignedIdentity": "str"},
+                        "keySource": "Microsoft.Storage",
+                        "keyvaultproperties": {
+                            "currentVersionedKeyExpirationTimestamp": "2020-02-20 00:00:00",
+                            "currentVersionedKeyIdentifier": "str",
+                            "keyname": "str",
+                            "keyvaulturi": "str",
+                            "keyversion": "str",
+                            "lastKeyRotationTimestamp": "2020-02-20 00:00:00",
+                        },
+                        "requireInfrastructureEncryption": bool,
+                        "services": {
+                            "blob": {"enabled": bool, "keyType": "str", "lastEnabledTime": "2020-02-20 00:00:00"},
+                            "file": {"enabled": bool, "keyType": "str", "lastEnabledTime": "2020-02-20 00:00:00"},
+                            "queue": {"enabled": bool, "keyType": "str", "lastEnabledTime": "2020-02-20 00:00:00"},
+                            "table": {"enabled": bool, "keyType": "str", "lastEnabledTime": "2020-02-20 00:00:00"},
+                        },
+                    },
+                    "extendedLocation": {"name": "str", "type": "str"},
+                    "identity": {
+                        "type": "str",
+                        "principalId": "str",
+                        "tenantId": "str",
+                        "userAssignedIdentities": {"str": {"clientId": "str", "principalId": "str"}},
+                    },
+                    "immutableStorageWithVersioning": {
+                        "enabled": bool,
+                        "immutabilityPolicy": {
+                            "allowProtectedAppendWrites": bool,
+                            "immutabilityPeriodSinceCreationInDays": 0,
+                            "state": "str",
+                        },
+                    },
+                    "isHnsEnabled": bool,
+                    "isLocalUserEnabled": bool,
+                    "isNfsV3Enabled": bool,
+                    "isSftpEnabled": bool,
+                    "keyPolicy": {"keyExpirationPeriodInDays": 0},
+                    "largeFileSharesState": "str",
+                    "minimumTlsVersion": "str",
+                    "networkAcls": {
+                        "defaultAction": "Allow",
+                        "bypass": "AzureServices",
+                        "ipRules": [{"value": "str", "action": "Allow"}],
+                        "resourceAccessRules": [{"resourceId": "str", "tenantId": "str"}],
+                        "virtualNetworkRules": [{"id": "str", "action": "Allow", "state": "str"}],
+                    },
+                    "publicNetworkAccess": "str",
+                    "routingPreference": {
+                        "publishInternetEndpoints": bool,
+                        "publishMicrosoftEndpoints": bool,
+                        "routingChoice": "str",
+                    },
+                    "sasPolicy": {"expirationAction": "Log", "sasExpirationPeriod": "str"},
+                    "supportsHttpsTrafficOnly": bool,
+                    "tags": {"str": "str"},
+                },
+                api_version="2024-01-01",
+            )
+        ).result()  # call '.result()' to poll until service return final result
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_storage_accounts_delete(self, resource_group):
+        response = await self.client.storage_accounts.delete(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_storage_accounts_get_properties(self, resource_group):
+        response = await self.client.storage_accounts.get_properties(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_storage_accounts_update(self, resource_group):
+        response = await self.client.storage_accounts.update(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            parameters={
+                "accessTier": "str",
+                "allowBlobPublicAccess": bool,
+                "allowCrossTenantReplication": bool,
+                "allowSharedKeyAccess": bool,
+                "allowedCopyScope": "str",
+                "azureFilesIdentityBasedAuthentication": {
+                    "directoryServiceOptions": "str",
+                    "activeDirectoryProperties": {
+                        "domainGuid": "str",
+                        "domainName": "str",
+                        "accountType": "str",
+                        "azureStorageSid": "str",
+                        "domainSid": "str",
+                        "forestName": "str",
+                        "netBiosDomainName": "str",
+                        "samAccountName": "str",
+                    },
+                    "defaultSharePermission": "str",
+                },
+                "customDomain": {"name": "str", "useSubDomainName": bool},
+                "defaultToOAuthAuthentication": bool,
+                "dnsEndpointType": "str",
+                "enableExtendedGroups": bool,
+                "encryption": {
+                    "identity": {"federatedIdentityClientId": "str", "userAssignedIdentity": "str"},
+                    "keySource": "Microsoft.Storage",
+                    "keyvaultproperties": {
+                        "currentVersionedKeyExpirationTimestamp": "2020-02-20 00:00:00",
+                        "currentVersionedKeyIdentifier": "str",
+                        "keyname": "str",
+                        "keyvaulturi": "str",
+                        "keyversion": "str",
+                        "lastKeyRotationTimestamp": "2020-02-20 00:00:00",
+                    },
+                    "requireInfrastructureEncryption": bool,
+                    "services": {
+                        "blob": {"enabled": bool, "keyType": "str", "lastEnabledTime": "2020-02-20 00:00:00"},
+                        "file": {"enabled": bool, "keyType": "str", "lastEnabledTime": "2020-02-20 00:00:00"},
+                        "queue": {"enabled": bool, "keyType": "str", "lastEnabledTime": "2020-02-20 00:00:00"},
+                        "table": {"enabled": bool, "keyType": "str", "lastEnabledTime": "2020-02-20 00:00:00"},
+                    },
+                },
+                "identity": {
+                    "type": "str",
+                    "principalId": "str",
+                    "tenantId": "str",
+                    "userAssignedIdentities": {"str": {"clientId": "str", "principalId": "str"}},
+                },
+                "immutableStorageWithVersioning": {
+                    "enabled": bool,
+                    "immutabilityPolicy": {
+                        "allowProtectedAppendWrites": bool,
+                        "immutabilityPeriodSinceCreationInDays": 0,
+                        "state": "str",
+                    },
+                },
+                "isLocalUserEnabled": bool,
+                "isSftpEnabled": bool,
+                "keyPolicy": {"keyExpirationPeriodInDays": 0},
+                "kind": "str",
+                "largeFileSharesState": "str",
+                "minimumTlsVersion": "str",
+                "networkAcls": {
+                    "defaultAction": "Allow",
+                    "bypass": "AzureServices",
+                    "ipRules": [{"value": "str", "action": "Allow"}],
+                    "resourceAccessRules": [{"resourceId": "str", "tenantId": "str"}],
+                    "virtualNetworkRules": [{"id": "str", "action": "Allow", "state": "str"}],
+                },
+                "publicNetworkAccess": "str",
+                "routingPreference": {
+                    "publishInternetEndpoints": bool,
+                    "publishMicrosoftEndpoints": bool,
+                    "routingChoice": "str",
+                },
+                "sasPolicy": {"expirationAction": "Log", "sasExpirationPeriod": "str"},
+                "sku": {"name": "str", "tier": "str"},
+                "supportsHttpsTrafficOnly": bool,
+                "tags": {"str": "str"},
+            },
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_storage_accounts_list(self, resource_group):
+        response = self.client.storage_accounts.list(
+            api_version="2024-01-01",
+        )
+        result = [r async for r in response]
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_storage_accounts_list_by_resource_group(self, resource_group):
+        response = self.client.storage_accounts.list_by_resource_group(
+            resource_group_name=resource_group.name,
+            api_version="2024-01-01",
+        )
+        result = [r async for r in response]
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_storage_accounts_list_keys(self, resource_group):
+        response = await self.client.storage_accounts.list_keys(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_storage_accounts_regenerate_key(self, resource_group):
+        response = await self.client.storage_accounts.regenerate_key(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            regenerate_key={"keyName": "str"},
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_storage_accounts_list_account_sas(self, resource_group):
+        response = await self.client.storage_accounts.list_account_sas(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            parameters={
+                "signedExpiry": "2020-02-20 00:00:00",
+                "signedPermission": "str",
+                "signedResourceTypes": "str",
+                "signedServices": "str",
+                "keyToSign": "str",
+                "signedIp": "str",
+                "signedProtocol": "str",
+                "signedStart": "2020-02-20 00:00:00",
+            },
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_storage_accounts_list_service_sas(self, resource_group):
+        response = await self.client.storage_accounts.list_service_sas(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            parameters={
+                "canonicalizedResource": "str",
+                "endPk": "str",
+                "endRk": "str",
+                "keyToSign": "str",
+                "rscc": "str",
+                "rscd": "str",
+                "rsce": "str",
+                "rscl": "str",
+                "rsct": "str",
+                "signedExpiry": "2020-02-20 00:00:00",
+                "signedIdentifier": "str",
+                "signedIp": "str",
+                "signedPermission": "str",
+                "signedProtocol": "str",
+                "signedResource": "str",
+                "signedStart": "2020-02-20 00:00:00",
+                "startPk": "str",
+                "startRk": "str",
+            },
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_storage_accounts_begin_failover(self, resource_group):
+        response = await (
+            await self.client.storage_accounts.begin_failover(
+                resource_group_name=resource_group.name,
+                account_name="str",
+                api_version="2024-01-01",
+            )
+        ).result()  # call '.result()' to poll until service return final result
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_storage_accounts_begin_hierarchical_namespace_migration(self, resource_group):
+        response = await (
+            await self.client.storage_accounts.begin_hierarchical_namespace_migration(
+                resource_group_name=resource_group.name,
+                account_name="str",
+                request_type="str",
+                api_version="2024-01-01",
+            )
+        ).result()  # call '.result()' to poll until service return final result
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_storage_accounts_begin_abort_hierarchical_namespace_migration(self, resource_group):
+        response = await (
+            await self.client.storage_accounts.begin_abort_hierarchical_namespace_migration(
+                resource_group_name=resource_group.name,
+                account_name="str",
+                api_version="2024-01-01",
+            )
+        ).result()  # call '.result()' to poll until service return final result
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_storage_accounts_begin_customer_initiated_migration(self, resource_group):
+        response = await (
+            await self.client.storage_accounts.begin_customer_initiated_migration(
+                resource_group_name=resource_group.name,
+                account_name="str",
+                parameters={
+                    "targetSkuName": "str",
+                    "id": "str",
+                    "migrationFailedDetailedReason": "str",
+                    "migrationFailedReason": "str",
+                    "migrationStatus": "str",
+                    "name": "str",
+                    "type": "str",
+                },
+                api_version="2024-01-01",
+            )
+        ).result()  # call '.result()' to poll until service return final result
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_storage_accounts_get_customer_initiated_migration(self, resource_group):
+        response = await self.client.storage_accounts.get_customer_initiated_migration(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            migration_name="str",
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_storage_accounts_begin_restore_blob_ranges(self, resource_group):
+        response = await (
+            await self.client.storage_accounts.begin_restore_blob_ranges(
+                resource_group_name=resource_group.name,
+                account_name="str",
+                parameters={
+                    "blobRanges": [{"endRange": "str", "startRange": "str"}],
+                    "timeToRestore": "2020-02-20 00:00:00",
+                },
+                api_version="2024-01-01",
+            )
+        ).result()  # call '.result()' to poll until service return final result
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_storage_accounts_revoke_user_delegation_keys(self, resource_group):
+        response = await self.client.storage_accounts.revoke_user_delegation_keys(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
diff --git a/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_storage_task_assignment_instances_report_operations.py b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_storage_task_assignment_instances_report_operations.py
new file mode 100644
index 000000000000..0414f11644c2
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_storage_task_assignment_instances_report_operations.py
@@ -0,0 +1,32 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+import pytest
+from azure.mgmt.storage import StorageManagementClient
+
+from devtools_testutils import AzureMgmtRecordedTestCase, RandomNameResourceGroupPreparer, recorded_by_proxy
+
+AZURE_LOCATION = "eastus"
+
+
+@pytest.mark.skip("you may need to update the auto-generated test case before run it")
+class TestStorageManagementStorageTaskAssignmentInstancesReportOperations(AzureMgmtRecordedTestCase):
+    def setup_method(self, method):
+        self.client = self.create_mgmt_client(StorageManagementClient)
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_storage_task_assignment_instances_report_list(self, resource_group):
+        response = self.client.storage_task_assignment_instances_report.list(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            storage_task_assignment_name="str",
+            api_version="2024-01-01",
+        )
+        result = [r for r in response]
+        # please add some check logic here by yourself
+        # ...
diff --git a/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_storage_task_assignment_instances_report_operations_async.py b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_storage_task_assignment_instances_report_operations_async.py
new file mode 100644
index 000000000000..21e2feb33ec3
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_storage_task_assignment_instances_report_operations_async.py
@@ -0,0 +1,33 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+import pytest
+from azure.mgmt.storage.aio import StorageManagementClient
+
+from devtools_testutils import AzureMgmtRecordedTestCase, RandomNameResourceGroupPreparer
+from devtools_testutils.aio import recorded_by_proxy_async
+
+AZURE_LOCATION = "eastus"
+
+
+@pytest.mark.skip("you may need to update the auto-generated test case before run it")
+class TestStorageManagementStorageTaskAssignmentInstancesReportOperationsAsync(AzureMgmtRecordedTestCase):
+    def setup_method(self, method):
+        self.client = self.create_mgmt_client(StorageManagementClient, is_async=True)
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_storage_task_assignment_instances_report_list(self, resource_group):
+        response = self.client.storage_task_assignment_instances_report.list(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            storage_task_assignment_name="str",
+            api_version="2024-01-01",
+        )
+        result = [r async for r in response]
+        # please add some check logic here by yourself
+        # ...
diff --git a/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_storage_task_assignments_instances_report_operations.py b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_storage_task_assignments_instances_report_operations.py
new file mode 100644
index 000000000000..616f5cc4accc
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_storage_task_assignments_instances_report_operations.py
@@ -0,0 +1,31 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+import pytest
+from azure.mgmt.storage import StorageManagementClient
+
+from devtools_testutils import AzureMgmtRecordedTestCase, RandomNameResourceGroupPreparer, recorded_by_proxy
+
+AZURE_LOCATION = "eastus"
+
+
+@pytest.mark.skip("you may need to update the auto-generated test case before run it")
+class TestStorageManagementStorageTaskAssignmentsInstancesReportOperations(AzureMgmtRecordedTestCase):
+    def setup_method(self, method):
+        self.client = self.create_mgmt_client(StorageManagementClient)
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_storage_task_assignments_instances_report_list(self, resource_group):
+        response = self.client.storage_task_assignments_instances_report.list(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            api_version="2024-01-01",
+        )
+        result = [r for r in response]
+        # please add some check logic here by yourself
+        # ...
diff --git a/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_storage_task_assignments_instances_report_operations_async.py b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_storage_task_assignments_instances_report_operations_async.py
new file mode 100644
index 000000000000..39351069a95c
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_storage_task_assignments_instances_report_operations_async.py
@@ -0,0 +1,32 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+import pytest
+from azure.mgmt.storage.aio import StorageManagementClient
+
+from devtools_testutils import AzureMgmtRecordedTestCase, RandomNameResourceGroupPreparer
+from devtools_testutils.aio import recorded_by_proxy_async
+
+AZURE_LOCATION = "eastus"
+
+
+@pytest.mark.skip("you may need to update the auto-generated test case before run it")
+class TestStorageManagementStorageTaskAssignmentsInstancesReportOperationsAsync(AzureMgmtRecordedTestCase):
+    def setup_method(self, method):
+        self.client = self.create_mgmt_client(StorageManagementClient, is_async=True)
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_storage_task_assignments_instances_report_list(self, resource_group):
+        response = self.client.storage_task_assignments_instances_report.list(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            api_version="2024-01-01",
+        )
+        result = [r async for r in response]
+        # please add some check logic here by yourself
+        # ...
diff --git a/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_storage_task_assignments_operations.py b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_storage_task_assignments_operations.py
new file mode 100644
index 000000000000..83f8160c270c
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_storage_task_assignments_operations.py
@@ -0,0 +1,162 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+import pytest
+from azure.mgmt.storage import StorageManagementClient
+
+from devtools_testutils import AzureMgmtRecordedTestCase, RandomNameResourceGroupPreparer, recorded_by_proxy
+
+AZURE_LOCATION = "eastus"
+
+
+@pytest.mark.skip("you may need to update the auto-generated test case before run it")
+class TestStorageManagementStorageTaskAssignmentsOperations(AzureMgmtRecordedTestCase):
+    def setup_method(self, method):
+        self.client = self.create_mgmt_client(StorageManagementClient)
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_storage_task_assignments_begin_create(self, resource_group):
+        response = self.client.storage_task_assignments.begin_create(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            storage_task_assignment_name="str",
+            parameters={
+                "properties": {
+                    "description": "str",
+                    "enabled": bool,
+                    "executionContext": {
+                        "trigger": {
+                            "parameters": {
+                                "endBy": "2020-02-20 00:00:00",
+                                "interval": 0,
+                                "intervalUnit": "Days",
+                                "startFrom": "2020-02-20 00:00:00",
+                                "startOn": "2020-02-20 00:00:00",
+                            },
+                            "type": "str",
+                        },
+                        "target": {"excludePrefix": ["str"], "prefix": ["str"]},
+                    },
+                    "report": {"prefix": "str"},
+                    "taskId": "str",
+                    "provisioningState": "str",
+                    "runStatus": {
+                        "finishTime": "str",
+                        "objectFailedCount": "str",
+                        "objectsOperatedOnCount": "str",
+                        "objectsSucceededCount": "str",
+                        "objectsTargetedCount": "str",
+                        "runResult": "str",
+                        "runStatusEnum": "str",
+                        "runStatusError": "str",
+                        "startTime": "str",
+                        "storageAccountId": "str",
+                        "summaryReportPath": "str",
+                        "taskAssignmentId": "str",
+                        "taskId": "str",
+                        "taskVersion": "str",
+                    },
+                },
+                "id": "str",
+                "name": "str",
+                "type": "str",
+            },
+            api_version="2024-01-01",
+        ).result()  # call '.result()' to poll until service return final result
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_storage_task_assignments_begin_update(self, resource_group):
+        response = self.client.storage_task_assignments.begin_update(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            storage_task_assignment_name="str",
+            parameters={
+                "properties": {
+                    "description": "str",
+                    "enabled": bool,
+                    "executionContext": {
+                        "target": {"excludePrefix": ["str"], "prefix": ["str"]},
+                        "trigger": {
+                            "parameters": {
+                                "endBy": "2020-02-20 00:00:00",
+                                "interval": 0,
+                                "intervalUnit": "Days",
+                                "startFrom": "2020-02-20 00:00:00",
+                                "startOn": "2020-02-20 00:00:00",
+                            },
+                            "type": "str",
+                        },
+                    },
+                    "provisioningState": "str",
+                    "report": {"prefix": "str"},
+                    "runStatus": {
+                        "finishTime": "str",
+                        "objectFailedCount": "str",
+                        "objectsOperatedOnCount": "str",
+                        "objectsSucceededCount": "str",
+                        "objectsTargetedCount": "str",
+                        "runResult": "str",
+                        "runStatusEnum": "str",
+                        "runStatusError": "str",
+                        "startTime": "str",
+                        "storageAccountId": "str",
+                        "summaryReportPath": "str",
+                        "taskAssignmentId": "str",
+                        "taskId": "str",
+                        "taskVersion": "str",
+                    },
+                    "taskId": "str",
+                }
+            },
+            api_version="2024-01-01",
+        ).result()  # call '.result()' to poll until service return final result
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_storage_task_assignments_get(self, resource_group):
+        response = self.client.storage_task_assignments.get(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            storage_task_assignment_name="str",
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_storage_task_assignments_begin_delete(self, resource_group):
+        response = self.client.storage_task_assignments.begin_delete(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            storage_task_assignment_name="str",
+            api_version="2024-01-01",
+        ).result()  # call '.result()' to poll until service return final result
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_storage_task_assignments_list(self, resource_group):
+        response = self.client.storage_task_assignments.list(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            api_version="2024-01-01",
+        )
+        result = [r for r in response]
+        # please add some check logic here by yourself
+        # ...
diff --git a/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_storage_task_assignments_operations_async.py b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_storage_task_assignments_operations_async.py
new file mode 100644
index 000000000000..767d0c07739a
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_storage_task_assignments_operations_async.py
@@ -0,0 +1,169 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+import pytest
+from azure.mgmt.storage.aio import StorageManagementClient
+
+from devtools_testutils import AzureMgmtRecordedTestCase, RandomNameResourceGroupPreparer
+from devtools_testutils.aio import recorded_by_proxy_async
+
+AZURE_LOCATION = "eastus"
+
+
+@pytest.mark.skip("you may need to update the auto-generated test case before run it")
+class TestStorageManagementStorageTaskAssignmentsOperationsAsync(AzureMgmtRecordedTestCase):
+    def setup_method(self, method):
+        self.client = self.create_mgmt_client(StorageManagementClient, is_async=True)
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_storage_task_assignments_begin_create(self, resource_group):
+        response = await (
+            await self.client.storage_task_assignments.begin_create(
+                resource_group_name=resource_group.name,
+                account_name="str",
+                storage_task_assignment_name="str",
+                parameters={
+                    "properties": {
+                        "description": "str",
+                        "enabled": bool,
+                        "executionContext": {
+                            "trigger": {
+                                "parameters": {
+                                    "endBy": "2020-02-20 00:00:00",
+                                    "interval": 0,
+                                    "intervalUnit": "Days",
+                                    "startFrom": "2020-02-20 00:00:00",
+                                    "startOn": "2020-02-20 00:00:00",
+                                },
+                                "type": "str",
+                            },
+                            "target": {"excludePrefix": ["str"], "prefix": ["str"]},
+                        },
+                        "report": {"prefix": "str"},
+                        "taskId": "str",
+                        "provisioningState": "str",
+                        "runStatus": {
+                            "finishTime": "str",
+                            "objectFailedCount": "str",
+                            "objectsOperatedOnCount": "str",
+                            "objectsSucceededCount": "str",
+                            "objectsTargetedCount": "str",
+                            "runResult": "str",
+                            "runStatusEnum": "str",
+                            "runStatusError": "str",
+                            "startTime": "str",
+                            "storageAccountId": "str",
+                            "summaryReportPath": "str",
+                            "taskAssignmentId": "str",
+                            "taskId": "str",
+                            "taskVersion": "str",
+                        },
+                    },
+                    "id": "str",
+                    "name": "str",
+                    "type": "str",
+                },
+                api_version="2024-01-01",
+            )
+        ).result()  # call '.result()' to poll until service return final result
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_storage_task_assignments_begin_update(self, resource_group):
+        response = await (
+            await self.client.storage_task_assignments.begin_update(
+                resource_group_name=resource_group.name,
+                account_name="str",
+                storage_task_assignment_name="str",
+                parameters={
+                    "properties": {
+                        "description": "str",
+                        "enabled": bool,
+                        "executionContext": {
+                            "target": {"excludePrefix": ["str"], "prefix": ["str"]},
+                            "trigger": {
+                                "parameters": {
+                                    "endBy": "2020-02-20 00:00:00",
+                                    "interval": 0,
+                                    "intervalUnit": "Days",
+                                    "startFrom": "2020-02-20 00:00:00",
+                                    "startOn": "2020-02-20 00:00:00",
+                                },
+                                "type": "str",
+                            },
+                        },
+                        "provisioningState": "str",
+                        "report": {"prefix": "str"},
+                        "runStatus": {
+                            "finishTime": "str",
+                            "objectFailedCount": "str",
+                            "objectsOperatedOnCount": "str",
+                            "objectsSucceededCount": "str",
+                            "objectsTargetedCount": "str",
+                            "runResult": "str",
+                            "runStatusEnum": "str",
+                            "runStatusError": "str",
+                            "startTime": "str",
+                            "storageAccountId": "str",
+                            "summaryReportPath": "str",
+                            "taskAssignmentId": "str",
+                            "taskId": "str",
+                            "taskVersion": "str",
+                        },
+                        "taskId": "str",
+                    }
+                },
+                api_version="2024-01-01",
+            )
+        ).result()  # call '.result()' to poll until service return final result
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_storage_task_assignments_get(self, resource_group):
+        response = await self.client.storage_task_assignments.get(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            storage_task_assignment_name="str",
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_storage_task_assignments_begin_delete(self, resource_group):
+        response = await (
+            await self.client.storage_task_assignments.begin_delete(
+                resource_group_name=resource_group.name,
+                account_name="str",
+                storage_task_assignment_name="str",
+                api_version="2024-01-01",
+            )
+        ).result()  # call '.result()' to poll until service return final result
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_storage_task_assignments_list(self, resource_group):
+        response = self.client.storage_task_assignments.list(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            api_version="2024-01-01",
+        )
+        result = [r async for r in response]
+        # please add some check logic here by yourself
+        # ...
diff --git a/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_table_operations.py b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_table_operations.py
new file mode 100644
index 000000000000..c7d7a5d17f01
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_table_operations.py
@@ -0,0 +1,83 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+import pytest
+from azure.mgmt.storage import StorageManagementClient
+
+from devtools_testutils import AzureMgmtRecordedTestCase, RandomNameResourceGroupPreparer, recorded_by_proxy
+
+AZURE_LOCATION = "eastus"
+
+
+@pytest.mark.skip("you may need to update the auto-generated test case before run it")
+class TestStorageManagementTableOperations(AzureMgmtRecordedTestCase):
+    def setup_method(self, method):
+        self.client = self.create_mgmt_client(StorageManagementClient)
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_table_create(self, resource_group):
+        response = self.client.table.create(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            table_name="str",
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_table_update(self, resource_group):
+        response = self.client.table.update(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            table_name="str",
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_table_get(self, resource_group):
+        response = self.client.table.get(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            table_name="str",
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_table_delete(self, resource_group):
+        response = self.client.table.delete(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            table_name="str",
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_table_list(self, resource_group):
+        response = self.client.table.list(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            api_version="2024-01-01",
+        )
+        result = [r for r in response]
+        # please add some check logic here by yourself
+        # ...
diff --git a/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_table_operations_async.py b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_table_operations_async.py
new file mode 100644
index 000000000000..1d4c2e86969f
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_table_operations_async.py
@@ -0,0 +1,84 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+import pytest
+from azure.mgmt.storage.aio import StorageManagementClient
+
+from devtools_testutils import AzureMgmtRecordedTestCase, RandomNameResourceGroupPreparer
+from devtools_testutils.aio import recorded_by_proxy_async
+
+AZURE_LOCATION = "eastus"
+
+
+@pytest.mark.skip("you may need to update the auto-generated test case before run it")
+class TestStorageManagementTableOperationsAsync(AzureMgmtRecordedTestCase):
+    def setup_method(self, method):
+        self.client = self.create_mgmt_client(StorageManagementClient, is_async=True)
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_table_create(self, resource_group):
+        response = await self.client.table.create(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            table_name="str",
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_table_update(self, resource_group):
+        response = await self.client.table.update(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            table_name="str",
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_table_get(self, resource_group):
+        response = await self.client.table.get(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            table_name="str",
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_table_delete(self, resource_group):
+        response = await self.client.table.delete(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            table_name="str",
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_table_list(self, resource_group):
+        response = self.client.table.list(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            api_version="2024-01-01",
+        )
+        result = [r async for r in response]
+        # please add some check logic here by yourself
+        # ...
diff --git a/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_table_services_operations.py b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_table_services_operations.py
new file mode 100644
index 000000000000..7dd84486324c
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_table_services_operations.py
@@ -0,0 +1,73 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+import pytest
+from azure.mgmt.storage import StorageManagementClient
+
+from devtools_testutils import AzureMgmtRecordedTestCase, RandomNameResourceGroupPreparer, recorded_by_proxy
+
+AZURE_LOCATION = "eastus"
+
+
+@pytest.mark.skip("you may need to update the auto-generated test case before run it")
+class TestStorageManagementTableServicesOperations(AzureMgmtRecordedTestCase):
+    def setup_method(self, method):
+        self.client = self.create_mgmt_client(StorageManagementClient)
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_table_services_list(self, resource_group):
+        response = self.client.table_services.list(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_table_services_set_service_properties(self, resource_group):
+        response = self.client.table_services.set_service_properties(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            parameters={
+                "cors": {
+                    "corsRules": [
+                        {
+                            "allowedHeaders": ["str"],
+                            "allowedMethods": ["str"],
+                            "allowedOrigins": ["str"],
+                            "exposedHeaders": ["str"],
+                            "maxAgeInSeconds": 0,
+                        }
+                    ]
+                },
+                "id": "str",
+                "name": "str",
+                "type": "str",
+            },
+            api_version="2024-01-01",
+            table_service_name="default",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_table_services_get_service_properties(self, resource_group):
+        response = self.client.table_services.get_service_properties(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            api_version="2024-01-01",
+            table_service_name="default",
+        )
+
+        # please add some check logic here by yourself
+        # ...
diff --git a/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_table_services_operations_async.py b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_table_services_operations_async.py
new file mode 100644
index 000000000000..a1324418fe24
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_table_services_operations_async.py
@@ -0,0 +1,74 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+import pytest
+from azure.mgmt.storage.aio import StorageManagementClient
+
+from devtools_testutils import AzureMgmtRecordedTestCase, RandomNameResourceGroupPreparer
+from devtools_testutils.aio import recorded_by_proxy_async
+
+AZURE_LOCATION = "eastus"
+
+
+@pytest.mark.skip("you may need to update the auto-generated test case before run it")
+class TestStorageManagementTableServicesOperationsAsync(AzureMgmtRecordedTestCase):
+    def setup_method(self, method):
+        self.client = self.create_mgmt_client(StorageManagementClient, is_async=True)
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_table_services_list(self, resource_group):
+        response = await self.client.table_services.list(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            api_version="2024-01-01",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_table_services_set_service_properties(self, resource_group):
+        response = await self.client.table_services.set_service_properties(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            parameters={
+                "cors": {
+                    "corsRules": [
+                        {
+                            "allowedHeaders": ["str"],
+                            "allowedMethods": ["str"],
+                            "allowedOrigins": ["str"],
+                            "exposedHeaders": ["str"],
+                            "maxAgeInSeconds": 0,
+                        }
+                    ]
+                },
+                "id": "str",
+                "name": "str",
+                "type": "str",
+            },
+            api_version="2024-01-01",
+            table_service_name="default",
+        )
+
+        # please add some check logic here by yourself
+        # ...
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_table_services_get_service_properties(self, resource_group):
+        response = await self.client.table_services.get_service_properties(
+            resource_group_name=resource_group.name,
+            account_name="str",
+            api_version="2024-01-01",
+            table_service_name="default",
+        )
+
+        # please add some check logic here by yourself
+        # ...
diff --git a/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_usages_operations.py b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_usages_operations.py
new file mode 100644
index 000000000000..e992f824553c
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_usages_operations.py
@@ -0,0 +1,30 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+import pytest
+from azure.mgmt.storage import StorageManagementClient
+
+from devtools_testutils import AzureMgmtRecordedTestCase, RandomNameResourceGroupPreparer, recorded_by_proxy
+
+AZURE_LOCATION = "eastus"
+
+
+@pytest.mark.skip("you may need to update the auto-generated test case before run it")
+class TestStorageManagementUsagesOperations(AzureMgmtRecordedTestCase):
+    def setup_method(self, method):
+        self.client = self.create_mgmt_client(StorageManagementClient)
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy
+    def test_usages_list_by_location(self, resource_group):
+        response = self.client.usages.list_by_location(
+            location="str",
+            api_version="2024-01-01",
+        )
+        result = [r for r in response]
+        # please add some check logic here by yourself
+        # ...
diff --git a/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_usages_operations_async.py b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_usages_operations_async.py
new file mode 100644
index 000000000000..e0e28353883d
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/generated_tests/test_storage_management_usages_operations_async.py
@@ -0,0 +1,31 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+import pytest
+from azure.mgmt.storage.aio import StorageManagementClient
+
+from devtools_testutils import AzureMgmtRecordedTestCase, RandomNameResourceGroupPreparer
+from devtools_testutils.aio import recorded_by_proxy_async
+
+AZURE_LOCATION = "eastus"
+
+
+@pytest.mark.skip("you may need to update the auto-generated test case before run it")
+class TestStorageManagementUsagesOperationsAsync(AzureMgmtRecordedTestCase):
+    def setup_method(self, method):
+        self.client = self.create_mgmt_client(StorageManagementClient, is_async=True)
+
+    @RandomNameResourceGroupPreparer(location=AZURE_LOCATION)
+    @recorded_by_proxy_async
+    async def test_usages_list_by_location(self, resource_group):
+        response = self.client.usages.list_by_location(
+            location="str",
+            api_version="2024-01-01",
+        )
+        result = [r async for r in response]
+        # please add some check logic here by yourself
+        # ...
diff --git a/sdk/storage/azure-mgmt-storage/setup.py b/sdk/storage/azure-mgmt-storage/setup.py
index ba4ee4bc7567..8bf8c28227a5 100644
--- a/sdk/storage/azure-mgmt-storage/setup.py
+++ b/sdk/storage/azure-mgmt-storage/setup.py
@@ -75,6 +75,7 @@
     },
     install_requires=[
         "isodate>=0.6.1",
+        "typing-extensions>=4.6.0",
         "azure-common>=1.1",
         "azure-mgmt-core>=1.3.2",
     ],